Merge pull request #274 from fnalacceleratormodeling/deps_bump

bump deps
fnalacceleratormodeling · May 9, 2024 · da36df6 · da36df6
2 parents 50f9715 + da69a77
commit da36df6
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -471,9 +471,6 @@ set(eigen_defs
     $<$<STREQUAL:${CMAKE_HOST_SYSTEM_PROCESSOR},ppc64le>:EIGEN_DONT_VECTORIZE>)
 add_subdirectory(${SYNERGIA3_SOURCE_DIR}/src/synergia/utils/eigen)
 set(ENV{FC} ${FC_BACKUP})
-find_package(Eigen3 REQUIRED PATHS
-             ${SYNERGIA3_BINARY_DIR}/src/synergia/utils/eigen)
-
 add_subdirectory(src)
 
 if(BUILD_EXAMPLES)

diff --git a/src/synergia/utils/eigen b/src/synergia/utils/eigen
diff --git a/src/synergia/utils/kokkos b/src/synergia/utils/kokkos
+14 −1		CHANGELOG.md
+1 −1		CMakeLists.txt
+8 −41		Copyright.txt
+0 −10		LICENSE
+17 −17		Makefile.kokkos
+5 −0		algorithms/src/sorting/impl/Kokkos_SortImpl.hpp
+1 −1		bin/nvcc_wrapper
+1 −0		cmake/KokkosCore_config.h.in
+20 −17		cmake/kokkos_enable_devices.cmake
+1 −0		cmake/kokkos_enable_options.cmake
+3 −2		core/src/Cuda/Kokkos_Cuda_Parallel_Range.hpp
+4 −0		core/src/HIP/Kokkos_HIP.cpp
+4 −0		core/src/HIP/Kokkos_HIP_SharedAllocationRecord.cpp
+4 −0		core/src/HIP/Kokkos_HIP_SharedAllocationRecord.hpp
+18 −1		core/src/HIP/Kokkos_HIP_Space.hpp
+6 −6		core/src/Serial/Kokkos_Serial_Parallel_Team.hpp
+14 −0		core/unit_test/TestExecSpacePartitioning.hpp
+26 −0		core/unit_test/TestReduce.hpp
+16 −0		core/unit_test/hip/TestHIP_Spaces.cpp
+1 −0		master_history.txt