-
Notifications
You must be signed in to change notification settings - Fork 116
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* WIP * Simplified MATLAB detection * Update CHANGES.md * Formatting * Minor update POSIX-compliance Signed-off-by: Vlad Gheorghiu <vsoftco@gmail.com> * Update Signed-off-by: Vlad Gheorghiu <vsoftco@gmail.com> * add .txt extension VERSION conflicts with cpp20 <version> on macOS, hence renamed to VERSION.txt Signed-off-by: Vlad Gheorghiu <vsoftco@gmail.com> * Update Signed-off-by: Vlad Gheorghiu <vsoftco@gmail.com> * Update Signed-off-by: Vlad Gheorghiu <vsoftco@gmail.com> * fix Signed-off-by: Vlad Gheorghiu <vsoftco@gmail.com> * Minor update Signed-off-by: Vlad Gheorghiu <vsoftco@gmail.com> * improve performance of multiidx2n (#173) * improve performance of multiidx2n * minor cleanup * minor fix * CCNOT example (#175) * add toffoli example * fix typo * Updated CCNOT example Signed-off-by: Vlad Gheorghiu <vsoftco@gmail.com> * Minor typos Signed-off-by: Vlad Gheorghiu <vsoftco@gmail.com> --------- Signed-off-by: Vlad Gheorghiu <vsoftco@gmail.com> Co-authored-by: Saman <100295082+enum-class@users.noreply.github.com>
- Loading branch information
1 parent
0753d9e
commit 46c8c98
Showing
19 changed files
with
146 additions
and
174 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,107 +1,13 @@ | ||
| # MATLAB support, disabled by default | ||
| option(QPP_MATLAB "MATLAB support" OFF) | ||
| if(${QPP_MATLAB}) | ||
| message(STATUS "Detecting MATLAB") | ||
| # Try to find it automatically | ||
| find_package( | ||
| Matlab | ||
| OPTIONAL_COMPONENTS MX_LIBRARY MAT_LIBRARY | ||
| QUIET) | ||
| message(STATUS "Detecting MATLAB...") | ||
| find_package(Matlab REQUIRED COMPONENTS MX_LIBRARY MAT_LIBRARY) | ||
| if(MATLAB_FOUND) | ||
| message(STATUS "Detecting MATLAB - done (in ${Matlab_ROOT_DIR})") | ||
| include_directories(SYSTEM ${Matlab_INCLUDE_DIRS}) | ||
| if(WIN32) | ||
| if(MSVC) | ||
| set(MATLAB_LIB_DIR | ||
| "${Matlab_ROOT_DIR}/extern/lib/win64/microsoft" | ||
| CACHE PATH "Custom path to MATLAB lib directory") | ||
| elseif(MINGW) | ||
| set(MATLAB_LIB_DIR | ||
| "${Matlab_ROOT_DIR}/extern/lib/win64/mingw64" | ||
| CACHE PATH "Custom path to MATLAB lib directory") | ||
| else() | ||
| message(FATAL_ERROR "Platform not supported, aborting.") | ||
| endif() | ||
| elseif(UNIX AND NOT APPLE) | ||
| set(MATLAB_LIB_DIR | ||
| "${Matlab_ROOT_DIR}/bin/glnxa64" | ||
| CACHE PATH "Custom path to MATLAB lib directory") | ||
| elseif(APPLE) | ||
| if(${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "arm64") | ||
| message( | ||
| FATAL_ERROR | ||
| "arm64 architecture is not (yet) supported by MATLAB, aborting.") | ||
| endif() | ||
| set(MATLAB_LIB_DIR | ||
| "${Matlab_ROOT_DIR}/bin/maci64" | ||
| CACHE PATH "Custom path to MATLAB lib directory") | ||
| else() | ||
| message(FATAL_ERROR "Platform not supported, aborting.") | ||
| endif() | ||
| link_directories(${MATLAB_LIB_DIR}) | ||
| add_compile_definitions(QPP_MATLAB) | ||
| set(BUILD_WITH_MATLAB TRUE) | ||
| else() # Location manually specified | ||
| set(MATLAB_INSTALL_DIR | ||
| "" | ||
| CACHE PATH "Custom path to MATLAB installation") | ||
| if(IS_DIRECTORY ${MATLAB_INSTALL_DIR}) | ||
| # MATLAB include files | ||
| set(MATLAB_INCLUDE_DIR | ||
| "${MATLAB_INSTALL_DIR}/extern/include" | ||
| CACHE PATH "Custom path to MATLAB include directory") | ||
| if(IS_DIRECTORY ${MATLAB_INCLUDE_DIR}) | ||
| include_directories(SYSTEM ${MATLAB_INCLUDE_DIR}) | ||
| else() | ||
| message(FATAL_ERROR "Possibly corrupted MATLAB include headers") | ||
| endif() | ||
| # MATLAB linker files | ||
| if(WIN32) | ||
| if(MSVC) | ||
| set(MATLAB_LIB_DIR | ||
| "${MATLAB_INSTALL_DIR}/extern/lib/win64/microsoft" | ||
| CACHE PATH "Custom path to MATLAB lib directory") | ||
| elseif(MINGW64) | ||
| set(MATLAB_LIB_DIR | ||
| "${MATLAB_INSTALL_DIR}/extern/lib/win64/mingw64" | ||
| CACHE PATH "Custom path to MATLAB lib directory") | ||
| else() | ||
| message(FATAL_ERROR "Platform not supported, aborting.") | ||
| endif() | ||
| elseif(UNIX AND NOT APPLE) | ||
| set(MATLAB_LIB_DIR | ||
| "${MATLAB_INSTALL_DIR}/bin/glnxa64" | ||
| CACHE PATH "Custom path to MATLAB lib directory") | ||
| elseif(APPLE) | ||
| set(MATLAB_LIB_DIR | ||
| "${MATLAB_INSTALL_DIR}/bin/maci64" | ||
| CACHE PATH "Custom path to MATLAB lib directory") | ||
| else() | ||
| message(FATAL_ERROR "Platform not supported, aborting.") | ||
| endif() | ||
| if(IS_DIRECTORY ${MATLAB_LIB_DIR}) | ||
| link_directories(${MATLAB_LIB_DIR}) | ||
| else() | ||
| message(FATAL_ERROR "Possibly corrupted MATLAB compiler libraries") | ||
| endif() | ||
| # Everything is OK, inject definition (as #define) in the source | ||
| message(STATUS "Detecting MATLAB - done (in ${MATLAB_INSTALL_DIR})") | ||
| add_compile_definitions(QPP_MATLAB) | ||
| set(BUILD_WITH_MATLAB TRUE) | ||
| else() | ||
| message(FATAL_ERROR "Could not detect MATLAB, aborting") | ||
| endif() | ||
| endif() | ||
| # MATLAB linking dependencies to be injected in the main CMakeLists.txt | ||
| if(${BUILD_WITH_MATLAB}) | ||
| if(WIN32) | ||
| if(MSVC) | ||
| set(QPP_MATLAB_LINK_DEPS libmx libmat) | ||
| elseif(MINGW) | ||
| set(QPP_MATLAB_LINK_DEPS mx mat) | ||
| endif() | ||
| else() | ||
| set(QPP_MATLAB_LINK_DEPS mx mat) | ||
| endif() | ||
| set(QPP_MATLAB_LINK_DEPS Matlab::mat Matlab::mx) | ||
| message(STATUS "Detected MATLAB in: ${Matlab_ROOT_DIR}") | ||
| else() | ||
| message(FATAL_ERROR "Could not detect MATLAB, aborting") | ||
| endif() | ||
| endif() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.