Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update CMake paths for dependent package use #478

Merged
merged 5 commits into from
Aug 21, 2023
Merged

Update CMake paths for dependent package use #478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c8c09a6
Update CMake paths for dependent package use
mlxd Aug 21, 2023
6e5113f
Auto update version
github-actions[bot] Aug 21, 2023
d95d116
Trigger CI
mlxd Aug 21, 2023
c33f57e
Update changelog
mlxd Aug 21, 2023
9fcc6e6
Update .github/CHANGELOG.md
mlxd Aug 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@

### Bug fixes

* Update the CMake internal references to enable sub-project compilation with affecting the parent package.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know why you did it, but I'm not getting what you meant by "with affecting the parent package.".
Could you maybe rephrase that?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That was a hastily written message indeed. Let's push ahead for the GPU fixes, and I'll make it better for release

[(#478)](https://github.com/PennyLaneAI/pennylane-lightning/pull/478)

* `apply` no longer mutates the inputted list of operations.
[(#474)](https://github.com/PennyLaneAI/pennylane-lightning/pull/474)

Expand Down
6 changes: 3 additions & 3 deletions cmake/support_kokkos.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ set(KOKKOS_VERSION 4.0.01)
# 3. Not installed, so fall back to building from source.
macro(FindKokkos target_name)
find_package(Kokkos
HINTS ${CMAKE_SOURCE_DIR}/kokkos
${CMAKE_SOURCE_DIR}/Kokkos
HINTS ${pennylane_lightning_SOURCE_DIR}/kokkos
${pennylane_lightning_SOURCE_DIR}/Kokkos
${Kokkos_Core_DIR}
/usr
/usr/local
Expand All @@ -30,7 +30,7 @@ macro(FindKokkos target_name)

find_library(Kokkos_core_lib
NAME kokkoscore.a libkokkoscore.a kokkoscore.so libkokkoscore.so
HINTS ${CMAKE_SOURCE_DIR}/Kokkos/lib
HINTS ${pennylane_lightning_SOURCE_DIR}/Kokkos/lib
${Kokkos_Core_DIR}/lib
${Kokkos_Core_DIR}/lib64
/usr/lib
Expand Down
2 changes: 1 addition & 1 deletion cmake/support_simulators.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ include_guard()
# All simulators have their own directory in "simulators"
# This macro will extract this list of directories.
MACRO(FIND_SIMULATORS_LIST RESULT)
set(SIMULATORS_DIR ${CMAKE_SOURCE_DIR}/pennylane_lightning/core/src/simulators)
set(SIMULATORS_DIR ${pennylane_lightning_SOURCE_DIR}/pennylane_lightning/core/src/simulators)
FILE(GLOB FULL_LIST RELATIVE ${SIMULATORS_DIR} ${SIMULATORS_DIR}/*)
SET(${RESULT} "")
FOREACH(ITEM ${FULL_LIST})
Expand Down
2 changes: 1 addition & 1 deletion pennylane_lightning/core/_version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
Version number (major.minor.patch[-label])
"""

__version__ = "0.32.0-dev8"
__version__ = "0.32.0-dev9"
2 changes: 1 addition & 1 deletion pennylane_lightning/core/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ endforeach()

if (BUILD_TESTS)
# Include macros supporting tests.
include("${CMAKE_SOURCE_DIR}/cmake/support_tests.cmake")
include("${pennylane_lightning_SOURCE_DIR}/cmake/support_tests.cmake")
FetchAndIncludeCatch()

include(CTest)
Expand Down
2 changes: 1 addition & 1 deletion pennylane_lightning/core/src/algorithms/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Debug)
endif()

include("${CMAKE_SOURCE_DIR}/cmake/support_tests.cmake")
include("${pennylane_lightning_SOURCE_DIR}/cmake/support_tests.cmake")
FetchAndIncludeCatch()

################################################################################
Expand Down
2 changes: 1 addition & 1 deletion pennylane_lightning/core/src/measurements/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Debug)
endif()

include("${CMAKE_SOURCE_DIR}/cmake/support_tests.cmake")
include("${pennylane_lightning_SOURCE_DIR}/cmake/support_tests.cmake")
FetchAndIncludeCatch()

################################################################################
Expand Down
2 changes: 1 addition & 1 deletion pennylane_lightning/core/src/observables/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Debug)
endif()

include("${CMAKE_SOURCE_DIR}/cmake/support_tests.cmake")
include("${pennylane_lightning_SOURCE_DIR}/cmake/support_tests.cmake")
FetchAndIncludeCatch()

################################################################################
Expand Down
2 changes: 1 addition & 1 deletion pennylane_lightning/core/src/simulators/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ add_subdirectory(base)
###############################################################################
# Determine simulator and include its directory
###############################################################################
include("${CMAKE_SOURCE_DIR}/cmake/support_simulators.cmake")
include("${pennylane_lightning_SOURCE_DIR}/cmake/support_simulators.cmake")
FIND_AND_ADD_SIMULATOR()

if (BUILD_TESTS)
Expand Down
2 changes: 1 addition & 1 deletion pennylane_lightning/core/src/simulators/base/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Debug)
endif()

include("${CMAKE_SOURCE_DIR}/cmake/support_tests.cmake")
include("${pennylane_lightning_SOURCE_DIR}/cmake/support_tests.cmake")
FetchAndIncludeCatch()

################################################################################
Expand Down
2 changes: 1 addition & 1 deletion pennylane_lightning/core/src/simulators/lightning_kokkos/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ option(PLKOKKOS_ENABLE_SANITIZER "Enable address sanitizer" OFF)
option(PLKOKKOS_ENABLE_WARNINGS "Enable warnings" ON)

# Include macro and functions supporting Kokkos libraries.
include("${CMAKE_SOURCE_DIR}/cmake/support_kokkos.cmake")
include("${pennylane_lightning_SOURCE_DIR}/cmake/support_kokkos.cmake")
FindKokkos(lightning_external_libs)

if(PLKOKKOS_ENABLE_SANITIZER)
Expand Down
2 changes: 1 addition & 1 deletion pennylane_lightning/core/src/simulators/lightning_kokkos/algorithms/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Debug)
endif()

include("${CMAKE_SOURCE_DIR}/cmake/support_tests.cmake")
include("${pennylane_lightning_SOURCE_DIR}/cmake/support_tests.cmake")
FetchAndIncludeCatch()

################################################################################
Expand Down
2 changes: 1 addition & 1 deletion pennylane_lightning/core/src/simulators/lightning_kokkos/gates/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Debug)
endif()

include("${CMAKE_SOURCE_DIR}/cmake/support_tests.cmake")
include("${pennylane_lightning_SOURCE_DIR}/cmake/support_tests.cmake")
FetchAndIncludeCatch()

################################################################################
Expand Down
2 changes: 1 addition & 1 deletion pennylane_lightning/core/src/simulators/lightning_kokkos/measurements/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Debug)
endif()

include("${CMAKE_SOURCE_DIR}/cmake/support_tests.cmake")
include("${pennylane_lightning_SOURCE_DIR}/cmake/support_tests.cmake")
FetchAndIncludeCatch()

################################################################################
Expand Down
2 changes: 1 addition & 1 deletion pennylane_lightning/core/src/simulators/lightning_kokkos/observables/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Debug)
endif()

include("${CMAKE_SOURCE_DIR}/cmake/support_tests.cmake")
include("${pennylane_lightning_SOURCE_DIR}/cmake/support_tests.cmake")
FetchAndIncludeCatch()

################################################################################
Expand Down
2 changes: 1 addition & 1 deletion pennylane_lightning/core/src/simulators/lightning_kokkos/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Debug)
endif()

include("${CMAKE_SOURCE_DIR}/cmake/support_tests.cmake")
include("${pennylane_lightning_SOURCE_DIR}/cmake/support_tests.cmake")
FetchAndIncludeCatch()

################################################################################
Expand Down
2 changes: 1 addition & 1 deletion pennylane_lightning/core/src/simulators/lightning_kokkos/utils/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Debug)
endif()

include("${CMAKE_SOURCE_DIR}/cmake/support_tests.cmake")
include("${pennylane_lightning_SOURCE_DIR}/cmake/support_tests.cmake")
FetchAndIncludeCatch()

################################################################################
Expand Down
2 changes: 1 addition & 1 deletion pennylane_lightning/core/src/simulators/lightning_qubit/algorithms/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Debug)
endif()

include("${CMAKE_SOURCE_DIR}/cmake/support_tests.cmake")
include("${pennylane_lightning_SOURCE_DIR}/cmake/support_tests.cmake")
FetchAndIncludeCatch()

################################################################################
Expand Down
2 changes: 1 addition & 1 deletion pennylane_lightning/core/src/simulators/lightning_qubit/gates/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Debug)
endif()

include("${CMAKE_SOURCE_DIR}/cmake/support_tests.cmake")
include("${pennylane_lightning_SOURCE_DIR}/cmake/support_tests.cmake")
FetchAndIncludeCatch()

################################################################################
Expand Down
2 changes: 1 addition & 1 deletion pennylane_lightning/core/src/simulators/lightning_qubit/measurements/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Debug)
endif()

include("${CMAKE_SOURCE_DIR}/cmake/support_tests.cmake")
include("${pennylane_lightning_SOURCE_DIR}/cmake/support_tests.cmake")
FetchAndIncludeCatch()

################################################################################
Expand Down
2 changes: 1 addition & 1 deletion pennylane_lightning/core/src/simulators/lightning_qubit/observables/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Debug)
endif()

include("${CMAKE_SOURCE_DIR}/cmake/support_tests.cmake")
include("${pennylane_lightning_SOURCE_DIR}/cmake/support_tests.cmake")
FetchAndIncludeCatch()

################################################################################
Expand Down
2 changes: 1 addition & 1 deletion pennylane_lightning/core/src/simulators/lightning_qubit/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Debug)
endif()

include("${CMAKE_SOURCE_DIR}/cmake/support_tests.cmake")
include("${pennylane_lightning_SOURCE_DIR}/cmake/support_tests.cmake")
FetchAndIncludeCatch()

################################################################################
Expand Down
2 changes: 1 addition & 1 deletion pennylane_lightning/core/src/simulators/lightning_qubit/utils/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Debug)
endif()

include("${CMAKE_SOURCE_DIR}/cmake/support_tests.cmake")
include("${pennylane_lightning_SOURCE_DIR}/cmake/support_tests.cmake")
FetchAndIncludeCatch()

################################################################################
Expand Down
2 changes: 1 addition & 1 deletion pennylane_lightning/core/src/utils/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Debug)
endif()

include("${CMAKE_SOURCE_DIR}/cmake/support_tests.cmake")
include("${pennylane_lightning_SOURCE_DIR}/cmake/support_tests.cmake")
FetchAndIncludeCatch()

################################################################################
Expand Down
Loading