Update Kokkos library in LAMMPS to v3.2 (4d90c2b7) · Commits · 郑智淋 / lammps

lib/kokkos/BUILD.md

+46 −31

Original line number	Original line	Diff line number	Diff line
	@@ -10,33 +10,45 @@ for C++. Applications heavily leveraging Kokkos are strongly encouraged to use
	You can either use Kokkos as an installed package (encouraged) or use Kokkos in-tree in your project.		You can either use Kokkos as an installed package (encouraged) or use Kokkos in-tree in your project.
	Modern CMake is exceedingly simple at a high-level (with the devil in the details).		Modern CMake is exceedingly simple at a high-level (with the devil in the details).
	Once Kokkos is installed In your `CMakeLists.txt` simply use:		Once Kokkos is installed In your `CMakeLists.txt` simply use:
	````		````cmake
	find_package(Kokkos REQUIRED)		find_package(Kokkos REQUIRED)
	````		````
	Then for every executable or library in your project:		Then for every executable or library in your project:
	````		````cmake
	target_link_libraries(myTarget Kokkos::kokkos)		target_link_libraries(myTarget Kokkos::kokkos)
	````		````
	That's it! There is no checking Kokkos preprocessor, compiler, or linker flags.		That's it! There is no checking Kokkos preprocessor, compiler, or linker flags.
	Kokkos propagates all the necessary flags to your project.		Kokkos propagates all the necessary flags to your project.
	This means not only is linking to Kokkos easy, but Kokkos itself can actually configure compiler and linker flags for your		This means not only is linking to Kokkos easy, but Kokkos itself can actually configure compiler and linker flags for your
	project. If building in-tree, there is no `find_package` and you link with `target_link_libraries(kokkos)`.		project.
			When configuring your project just set:
			````bash
			> cmake ${srcdir} \
			-DKokkos_ROOT=${kokkos_install_prefix} \
			-DCMAKE_CXX_COMPILER=${compiler_used_to_build_kokkos}
			````
			Note: You may need the following if using some versions of CMake (e.g. 3.12):
			````cmake
			cmake_policy(SET CMP0074 NEW)
			````
			If building in-tree, there is no `find_package`. You can use `add_subdirectory(kokkos)` with the Kokkos source and again just link with `target_link_libraries(Kokkos::kokkos)`.
			The examples in `examples/cmake_build_installed` and `examples/cmake_build_in_tree` can help get you started.


	## Configuring CMake		## Configuring CMake
	A very basic installation is done with:		A very basic installation of Kokkos is done with:
	````		````bash
	cmake ${srcdir} \		> cmake ${srcdir} \
	-DCMAKE_CXX_COMPILER=g++ \		-DCMAKE_CXX_COMPILER=g++ \
	-DCMAKE_INSTALL_PREFIX=${my_install_folder}		-DCMAKE_INSTALL_PREFIX=${kokkos_install_folder}
	````		````
	which builds and installed a default Kokkos when you run `make install`.		which builds and installed a default Kokkos when you run `make install`.
	There are numerous device backends, options, and architecture-specific optimizations that can be configured, e.g.		There are numerous device backends, options, and architecture-specific optimizations that can be configured, e.g.
	````		````bash
	cmake ${srcdir} \		> cmake ${srcdir} \
	-DCMAKE_CXX_COMPILER=g++ \		-DCMAKE_CXX_COMPILER=g++ \
	-DCMAKE_INSTALL_PREFIX=${my_install_folder} \		-DCMAKE_INSTALL_PREFIX=${kokkos_install_folder} \
	-DKokkos_ENABLE_OPENMP=On		-DKokkos_ENABLE_OPENMP=ON
	````		````
	which activates the OpenMP backend. All of the options controlling device backends, options, architectures, and third-party libraries (TPLs) are given below.		which activates the OpenMP backend. All of the options controlling device backends, options, architectures, and third-party libraries (TPLs) are given below.

	@@ -50,16 +62,16 @@ which activates the OpenMP backend. All of the options controlling device backen
	## Spack		## Spack
	An alternative to manually building with the CMake is to use the Spack package manager.		An alternative to manually building with the CMake is to use the Spack package manager.
	To do so, download the `kokkos-spack` git repo and add to the package list:		To do so, download the `kokkos-spack` git repo and add to the package list:
	````		````bash
	spack repo add $path-to-kokkos-spack		> spack repo add $path-to-kokkos-spack
	````		````
	A basic installation would be done as:		A basic installation would be done as:
	````		````bash
	spack install kokkos		> spack install kokkos
	````		````
	Spack allows options and and compilers to be tuned in the install command.		Spack allows options and and compilers to be tuned in the install command.
	````		````bash
	spack install kokkos@3.0 %gcc@7.3.0 +openmp		> spack install kokkos@3.0 %gcc@7.3.0 +openmp
	````		````
	This example illustrates the three most common parameters to Spack:		This example illustrates the three most common parameters to Spack:
	* Variants: specified with, e.g. `+openmp`, this activates (or deactivates with, e.g. `~openmp`) certain options.		* Variants: specified with, e.g. `+openmp`, this activates (or deactivates with, e.g. `~openmp`) certain options.
	@@ -67,17 +79,17 @@ This example illustrates the three most common parameters to Spack:
	* Compiler: a default compiler will be chosen if not specified, but an exact compiler version can be given with the `%`option.		* Compiler: a default compiler will be chosen if not specified, but an exact compiler version can be given with the `%`option.

	For a complete list of Kokkos options, run:		For a complete list of Kokkos options, run:
			````bash
			> spack info kokkos
	````		````
	spack info kokkos		More details can be found in the [Spack README](Spack.md)
	````
	More details can be found in the kokkos-spack repository [README](https://github.com/kokkos/kokkos-spack/blob/master/README.md).

	#### Spack Development		#### Spack Development
	Spack currently installs packages to a location determined by a unique hash. This hash name is not really "human readable".		Spack currently installs packages to a location determined by a unique hash. This hash name is not really "human readable".
	Generally, Spack usage should never really require you to reference the computer-generated unique install folder.		Generally, Spack usage should never really require you to reference the computer-generated unique install folder.
	If you must know, you can locate Spack Kokkos installations with:		If you must know, you can locate Spack Kokkos installations with:
	````		````bash
	spack find -p kokkos ...		> spack find -p kokkos ...
	````		````
	where `...` is the unique spec identifying the particular Kokkos configuration and version.		where `...` is the unique spec identifying the particular Kokkos configuration and version.

	@@ -104,6 +116,12 @@ Device backends can be enabled by specifying `-DKokkos_ENABLE_X`.
	* Kokkos_ENABLE_SERIAL		* Kokkos_ENABLE_SERIAL
	* Whether to build serial backend		* Whether to build serial backend
	* BOOL Default: ON		* BOOL Default: ON
			* Kokkos_ENABLE_HIP (Experimental)
			* Whether to build HIP backend
			* BOOL Default: OFF
			* Kokkos_ENABLE_OPENMPTARGET (Experimental)
			* Whether to build the OpenMP target backend
			* BOOL Default: OFF

	## Enable Options		## Enable Options
	Options can be enabled by specifying `-DKokkos_ENABLE_X`.		Options can be enabled by specifying `-DKokkos_ENABLE_X`.
	@@ -138,9 +156,6 @@ Options can be enabled by specifying `-DKokkos_ENABLE_X`.
	* Kokkos_ENABLE_DEBUG_DUALVIEW_MODIFY_CHECK		* Kokkos_ENABLE_DEBUG_DUALVIEW_MODIFY_CHECK
	* Debug check on dual views		* Debug check on dual views
	* BOOL Default: OFF		* BOOL Default: OFF
	* Kokkos_ENABLE_DEPRECATED_CODE
	* Whether to enable deprecated code
	* BOOL Default: OFF
	* Kokkos_ENABLE_EXAMPLES		* Kokkos_ENABLE_EXAMPLES
	* Whether to enable building examples		* Whether to enable building examples
	* BOOL Default: OFF		* BOOL Default: OFF
	@@ -150,9 +165,6 @@ Options can be enabled by specifying `-DKokkos_ENABLE_X`.
	* Kokkos_ENABLE_LARGE_MEM_TESTS		* Kokkos_ENABLE_LARGE_MEM_TESTS
	* Whether to perform extra large memory tests		* Whether to perform extra large memory tests
	* BOOL_Default: OFF		* BOOL_Default: OFF
	* Kokkos_ENABLE_PROFILING
	* Whether to create bindings for profiling tools
	* BOOL Default: ON
	* Kokkos_ENABLE_PROFILING_LOAD_PRINT		* Kokkos_ENABLE_PROFILING_LOAD_PRINT
	* Whether to print information about which profiling tools gotloaded		* Whether to print information about which profiling tools gotloaded
	* BOOL Default: OFF		* BOOL Default: OFF
	@@ -235,8 +247,11 @@ Architecture-specific optimizations can be enabled by specifying `-DKokkos_ARCH_
	* Kokkos_ARCH_BGQ		* Kokkos_ARCH_BGQ
	* Whether to optimize for the BGQ architecture		* Whether to optimize for the BGQ architecture
	* BOOL Default: OFF		* BOOL Default: OFF
	* Kokkos_ARCH_EPYC		* Kokkos_ARCH_ZEN
	* Whether to optimize for the EPYC architecture		* Whether to optimize for the Zen architecture
			* BOOL Default: OFF
			* Kokkos_ARCH_ZEN2
			* Whether to optimize for the Zen2 architecture
	* BOOL Default: OFF		* BOOL Default: OFF
	* Kokkos_ARCH_HSW		* Kokkos_ARCH_HSW
	* Whether to optimize for the HSW architecture		* Whether to optimize for the HSW architecture

lib/kokkos/CHANGELOG.md

+108 −1

Original line number	Original line	Diff line number	Diff line
	# Change Log		# Change Log

	## [3.1.1](https://github.com/kokkos/kokkos/tree/3.1.1) (2020-04-14)		## [3.2.00](https://github.com/kokkos/kokkos/tree/3.2.00) (2020-08-19)
			[Full Changelog](https://github.com/kokkos/kokkos/compare/3.1.01...3.2.00)

			Implemented enhancements:

			- HIP:Enable stream in HIP [\#3163](https://github.com/kokkos/kokkos/issues/3163)
			- HIP:Add support for shuffle reduction for the HIP backend [\#3154](https://github.com/kokkos/kokkos/issues/3154)
			- HIP:Add implementations of missing HIPHostPinnedSpace methods for LAMMPS [\#3137](https://github.com/kokkos/kokkos/issues/3137)
			- HIP:Require HIP 3.5.0 or higher [\#3099](https://github.com/kokkos/kokkos/issues/3099)
			- HIP:WorkGraphPolicy for HIP [\#3096](https://github.com/kokkos/kokkos/issues/3096)
			- OpenMPTarget: Significant update to the new experimental backend. Requires C++17, works on Intel GPUs, reference counting fixes. [\#3169](https://github.com/kokkos/kokkos/issues/3169)
			- Windows Cuda support [\#3018](https://github.com/kokkos/kokkos/issues/3018)
			- Pass `-Wext-lambda-captures-this` to NVCC when support for `__host__ __device__` lambda is enabled from CUDA 11 [\#3241](https://github.com/kokkos/kokkos/issues/3241)
			- Use explicit staging buffer for constant memory kernel launches and cleanup host/device synchronization [\#3234](https://github.com/kokkos/kokkos/issues/3234)
			- Various fixup to policies including making TeamPolicy default constructible and making RangePolicy and TeamPolicy assignable 1: [\#3202](https://github.com/kokkos/kokkos/issues/3202)
			- Various fixup to policies including making TeamPolicy default constructible and making RangePolicy and TeamPolicy assignable 2: [\#3203](https://github.com/kokkos/kokkos/issues/3203)
			- Various fixup to policies including making TeamPolicy default constructible and making RangePolicy and TeamPolicy assignable 3: [\#3196](https://github.com/kokkos/kokkos/issues/3196)
			- Annotations for `DefaultExectutionSpace` and `DefaultHostExectutionSpace` to use in static analysis [\#3189](https://github.com/kokkos/kokkos/issues/3189)
			- Add documentation on using Spack to install Kokkos and developing packages that depend on Kokkos [\#3187](https://github.com/kokkos/kokkos/issues/3187)
			- Improve support for nvcc\_wrapper with exotic host compiler [\#3186](https://github.com/kokkos/kokkos/issues/3186)
			- Add OpenMPTarget backend flags for NVC++ compiler [\#3185](https://github.com/kokkos/kokkos/issues/3185)
			- Move deep\_copy/create\_mirror\_view on Experimental::OffsetView into Kokkos:: namespace [\#3166](https://github.com/kokkos/kokkos/issues/3166)
			- Allow for larger block size in HIP [\#3165](https://github.com/kokkos/kokkos/issues/3165)
			- View: Added names of Views to the different View initialize/free kernels [\#3159](https://github.com/kokkos/kokkos/issues/3159)
			- Cuda: Caching cudaFunctorAttributes and whether L1/Shmem prefer was set [\#3151](https://github.com/kokkos/kokkos/issues/3151)
			- BuildSystem: Provide an explicit default CMAKE\_BUILD\_TYPE [\#3131](https://github.com/kokkos/kokkos/issues/3131)
			- Cuda: Update CUDA occupancy calculation [\#3124](https://github.com/kokkos/kokkos/issues/3124)
			- Vector: Adding data() to Vector [\#3123](https://github.com/kokkos/kokkos/issues/3123)
			- BuildSystem: Add CUDA Ampere configuration support [\#3122](https://github.com/kokkos/kokkos/issues/3122)
			- General: Apply [[noreturn]] to Kokkos::abort when applicable [\#3106](https://github.com/kokkos/kokkos/issues/3106)
			- TeamPolicy: Validate storage level argument passed to TeamPolicy::set\_scratch\_size() [\#3098](https://github.com/kokkos/kokkos/issues/3098)
			- nvcc\_wrapper: send --cudart to nvcc instead of host compiler [\#3092](https://github.com/kokkos/kokkos/issues/3092)
			- BuildSystem: Make kokkos\_has\_string() function in Makefile.kokkos case insensitive [\#3091](https://github.com/kokkos/kokkos/issues/3091)
			- Modify KOKKOS\_FUNCTION macro for clang-tidy analysis [\#3087](https://github.com/kokkos/kokkos/issues/3087)
			- Move allocation profiling to allocate/deallocate calls [\#3084](https://github.com/kokkos/kokkos/issues/3084)
			- BuildSystem: FATAL\_ERROR when attempting in-source build [\#3082](https://github.com/kokkos/kokkos/issues/3082)
			- Change enums in ScatterView to types [\#3076](https://github.com/kokkos/kokkos/issues/3076)
			- HIP: Changes for new compiler/runtime [\#3067](https://github.com/kokkos/kokkos/issues/3067)
			- Extract and use get\_gpu [\#3061](https://github.com/kokkos/kokkos/issues/3061)
			- Extract and use get\_gpu [\#3048](https://github.com/kokkos/kokkos/issues/3048)
			- Add is\_allocated to View-like containers [\#3059](https://github.com/kokkos/kokkos/issues/3059)
			- Combined reducers for scalar references [\#3052](https://github.com/kokkos/kokkos/issues/3052)
			- Add configurable capacity for UniqueToken [\#3051](https://github.com/kokkos/kokkos/issues/3051)
			- Add installation testing [\#3034](https://github.com/kokkos/kokkos/issues/3034)
			- BuildSystem: Add -expt-relaxed-constexpr flag to nvcc\_wrapper [\#3021](https://github.com/kokkos/kokkos/issues/3021)
			- HIP: Add UniqueToken [\#3020](https://github.com/kokkos/kokkos/issues/3020)
			- Autodetect number of devices [\#3013](https://github.com/kokkos/kokkos/issues/3013)


			Fixed bugs:

			- Check error code from `cudaStreamSynchronize` in CUDA fences [\#3255](https://github.com/kokkos/kokkos/issues/3255)
			- Fix issue with C++ standard flags when using `nvcc\_wrapper` with PGI [\#3254](https://github.com/kokkos/kokkos/issues/3254)
			- Add missing threadfence in lock-based atomics [\#3208](https://github.com/kokkos/kokkos/issues/3208)
			- Fix dedup of linker flags for shared lib on CMake <=3.12 [\#3176](https://github.com/kokkos/kokkos/issues/3176)
			- Fix memory leak with CUDA streams [\#3170](https://github.com/kokkos/kokkos/issues/3170)
			- BuildSystem: Fix OpenMP Target flags for Cray [\#3161](https://github.com/kokkos/kokkos/issues/3161)
			- ScatterView: fix for OpenmpTarget remove inheritance from reducers [\#3162](https://github.com/kokkos/kokkos/issues/3162)
			- BuildSystem: Set OpenMP flags according to host compiler [\#3127](https://github.com/kokkos/kokkos/issues/3127)
			- OpenMP: Fix logic for nested omp in partition\_master bug [\#3101](https://github.com/kokkos/kokkos/issues/3101)
			- BuildSystem: Fixes for Cuda/11 and c++17 [\#3085](https://github.com/kokkos/kokkos/issues/3085)
			- HIP: Fix print\_configuration [\#3080](https://github.com/kokkos/kokkos/issues/3080)
			- Conditionally define get\_gpu [\#3072](https://github.com/kokkos/kokkos/issues/3072)
			- Fix bounds for ranges in random number generator [\#3069](https://github.com/kokkos/kokkos/issues/3069)
			- Fix Cuda minor arch check [\#3035](https://github.com/kokkos/kokkos/issues/3035)

			Incompatibilities:

			- Remove ETI support [\#3157](https://github.com/kokkos/kokkos/issues/3157)
			- Remove KOKKOS\_INTERNAL\_ENABLE\_NON\_CUDA\_BACKEND [\#3147](https://github.com/kokkos/kokkos/issues/3147)
			- Remove core/unit\_test/config [\#3146](https://github.com/kokkos/kokkos/issues/3146)
			- Removed the preprocessor branch for KOKKOS\_ENABLE\_PROFILING [\#3115](https://github.com/kokkos/kokkos/issues/3115)
			- Disable profiling with MSVC [\#3066](https://github.com/kokkos/kokkos/issues/3066)

			Closed issues:

			- Silent error (Validate storage level arg to set_scratch_size) [\#3097](https://github.com/kokkos/kokkos/issues/3097)
			- Remove KOKKKOS\_ENABLE\_PROFILING Option [\#3095](https://github.com/kokkos/kokkos/issues/3095)
			- Cuda 11 -\> allow C++17 [\#3083](https://github.com/kokkos/kokkos/issues/3083)
			- In source build failure not explained [\#3081](https://github.com/kokkos/kokkos/issues/3081)
			- Allow naming of Views for initialization kernel [\#3070](https://github.com/kokkos/kokkos/issues/3070)
			- DefaultInit tests failing when using CTest resource allocation feature [\#3040](https://github.com/kokkos/kokkos/issues/3040)
			- Add installation testing. [\#3037](https://github.com/kokkos/kokkos/issues/3037)
			- nvcc\_wrapper needs to handle `-expt-relaxed-constexpr` flag [\#3017](https://github.com/kokkos/kokkos/issues/3017)
			- CPU core oversubscription warning on macOS with OpenMP backend [\#2996](https://github.com/kokkos/kokkos/issues/2996)
			- Default behavior of KOKKOS\_NUM\_DEVICES to use all devices available [\#2975](https://github.com/kokkos/kokkos/issues/2975)
			- Assert blocksize \> 0 [\#2974](https://github.com/kokkos/kokkos/issues/2974)
			- Add ability to assign kokkos profile function from executable [\#2973](https://github.com/kokkos/kokkos/issues/2973)
			- ScatterView Support for the pre/post increment operator [\#2967](https://github.com/kokkos/kokkos/issues/2967)

			- Compiler issue: Cuda build with clang 10 has errors with the atomic unit tests [\#3237](https://github.com/kokkos/kokkos/issues/3237)
			- Incompatibility of flags for C++ standard with PGI v20.4 on Power9/NVIDIA V100 system [\#3252](https://github.com/kokkos/kokkos/issues/3252)
			- Error configuring as subproject [\#3140](https://github.com/kokkos/kokkos/issues/3140)
			- CMake fails with Nvidia compilers when the GPU architecture option is not supplied (Fix configure with OMPT and Cuda) [\#3207](https://github.com/kokkos/kokkos/issues/3207)
			- PGI compiler being passed the gcc -fopenmp flag [\#3125](https://github.com/kokkos/kokkos/issues/3125)
			- Cuda: Memory leak when using CUDA stream [\#3167](https://github.com/kokkos/kokkos/issues/3167)
			- RangePolicy has an implicitly deleted assignment operator [\#3192](https://github.com/kokkos/kokkos/issues/3192)
			- MemorySpace::allocate needs to have memory pool counting. [\#3064](https://github.com/kokkos/kokkos/issues/3064)
			- Missing write fence for lock based atomics on CUDA [\#3038](https://github.com/kokkos/kokkos/issues/3038)
			- CUDA compute capability version check problem [\#3026](https://github.com/kokkos/kokkos/issues/3026)
			- Make DynRankView fencing consistent [\#3014](https://github.com/kokkos/kokkos/issues/3014)
			- nvcc\_wrapper cant handle -Xcompiler -o out.o [\#2993](https://github.com/kokkos/kokkos/issues/2993)
			- Reductions of non-trivial types of size 4 fail in CUDA shfl operations [\#2990](https://github.com/kokkos/kokkos/issues/2990)
			- complex\_double misalignment in reduce, clang+CUDA [\#2989](https://github.com/kokkos/kokkos/issues/2989)
			- Span of degenerated $zero-length$ subviews is not zero in some special cases [\#2979](https://github.com/kokkos/kokkos/issues/2979)
			- Rank 1 custom layouts dont work as expected. [\#2840](https://github.com/kokkos/kokkos/issues/2840)

			## [3.1.01](https://github.com/kokkos/kokkos/tree/3.1.1) (2020-04-14)
	[Full Changelog](https://github.com/kokkos/kokkos/compare/3.1.00...3.1.1)		[Full Changelog](https://github.com/kokkos/kokkos/compare/3.1.00...3.1.1)

	Fixed bugs:		Fixed bugs:

lib/kokkos/CMakeLists.txt

+24 −17

Original line number	Original line	Diff line number	Diff line

			# Disable in-source builds to prevent source tree corruption.
			if( "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}" )
			message( FATAL_ERROR "FATAL: In-source builds are not allowed. You should create a separate directory for build files." )
			endif()

	# We want to determine if options are given with the wrong case		# We want to determine if options are given with the wrong case
	# In order to detect which arguments are given to compare against		# In order to detect which arguments are given to compare against
	# the list of valid arguments, at the beginning here we need to		# the list of valid arguments, at the beginning here we need to
	@@ -34,6 +39,9 @@ IF(COMMAND TRIBITS_PACKAGE_DECL)
	ELSE()		ELSE()
	SET(KOKKOS_HAS_TRILINOS OFF)		SET(KOKKOS_HAS_TRILINOS OFF)
	ENDIF()		ENDIF()
			# Is this build a subdirectory of another project
			GET_DIRECTORY_PROPERTY(HAS_PARENT PARENT_DIRECTORY)


	INCLUDE(${KOKKOS_SRC_PATH}/cmake/kokkos_functions.cmake)		INCLUDE(${KOKKOS_SRC_PATH}/cmake/kokkos_functions.cmake)
	INCLUDE(${KOKKOS_SRC_PATH}/cmake/kokkos_pick_cxx_std.cmake)		INCLUDE(${KOKKOS_SRC_PATH}/cmake/kokkos_pick_cxx_std.cmake)
	@@ -75,16 +83,17 @@ IF(NOT KOKKOS_HAS_TRILINOS)
	SET(CMAKE_CXX_COMPILER ${SPACK_CXX} CACHE STRING "the C++ compiler" FORCE)		SET(CMAKE_CXX_COMPILER ${SPACK_CXX} CACHE STRING "the C++ compiler" FORCE)
	SET(ENV{CXX} ${SPACK_CXX})		SET(ENV{CXX} ${SPACK_CXX})
	ENDIF()		ENDIF()
	ENDif()
	IF(NOT DEFINED ${PROJECT_NAME})
	# WORKAROUND FOR HIPCC
	IF(Kokkos_ENABLE_HIP)
	SET(KOKKOS_INTERNAL_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --amdgpu-target=gfx906")
	ENDIF()		ENDIF()
			# Always call the project command to define Kokkos_ variables
			# and to make sure that C++ is an enabled language
	PROJECT(Kokkos CXX)		PROJECT(Kokkos CXX)
	IF(Kokkos_ENABLE_HIP)		IF(NOT HAS_PARENT)
	SET(CMAKE_CXX_FLAGS ${KOKKOS_INTERNAL_CMAKE_CXX_FLAGS})		IF (NOT CMAKE_BUILD_TYPE)
			SET(DEFAULT_BUILD_TYPE "RelWithDebInfo")
			MESSAGE(STATUS "Setting build type to '${DEFAULT_BUILD_TYPE}' as none was specified.")
			SET(CMAKE_BUILD_TYPE "${DEFAULT_BUILD_TYPE}" CACHE STRING
			"Choose the type of build, options are: Debug, Release, RelWithDebInfo and MinSizeRel."
			FORCE)
	ENDIF()		ENDIF()
	ENDIF()		ENDIF()
	ENDIF()		ENDIF()
	@@ -102,8 +111,8 @@ ENDIF()


	set(Kokkos_VERSION_MAJOR 3)		set(Kokkos_VERSION_MAJOR 3)
	set(Kokkos_VERSION_MINOR 1)		set(Kokkos_VERSION_MINOR 2)
	set(Kokkos_VERSION_PATCH 1)		set(Kokkos_VERSION_PATCH 0)
	set(Kokkos_VERSION "${Kokkos_VERSION_MAJOR}.${Kokkos_VERSION_MINOR}.${Kokkos_VERSION_PATCH}")		set(Kokkos_VERSION "${Kokkos_VERSION_MAJOR}.${Kokkos_VERSION_MINOR}.${Kokkos_VERSION_PATCH}")
	math(EXPR KOKKOS_VERSION "${Kokkos_VERSION_MAJOR} * 10000 + ${Kokkos_VERSION_MINOR} * 100 + ${Kokkos_VERSION_PATCH}")		math(EXPR KOKKOS_VERSION "${Kokkos_VERSION_MAJOR} * 10000 + ${Kokkos_VERSION_MINOR} * 100 + ${Kokkos_VERSION_PATCH}")

	@@ -147,6 +156,7 @@ INCLUDE(${KOKKOS_SRC_PATH}/cmake/kokkos_tribits.cmake)
	# Check the environment and set certain variables		# Check the environment and set certain variables
	# to allow platform-specific checks		# to allow platform-specific checks
	INCLUDE(${KOKKOS_SRC_PATH}/cmake/kokkos_check_env.cmake)		INCLUDE(${KOKKOS_SRC_PATH}/cmake/kokkos_check_env.cmake)

	# The build environment setup goes in the following steps		# The build environment setup goes in the following steps
	# 1) Check all the enable options. This includes checking Kokkos_DEVICES		# 1) Check all the enable options. This includes checking Kokkos_DEVICES
	# 2) Check the compiler ID (type and version)		# 2) Check the compiler ID (type and version)
	@@ -169,7 +179,6 @@ SET(KOKKOS_EXT_LIBRARIES Kokkos::kokkos Kokkos::kokkoscore Kokkos::kokkoscontain
	SET(KOKKOS_INT_LIBRARIES kokkos kokkoscore kokkoscontainers kokkosalgorithms)		SET(KOKKOS_INT_LIBRARIES kokkos kokkoscore kokkoscontainers kokkosalgorithms)
	SET_PROPERTY(GLOBAL PROPERTY KOKKOS_INT_LIBRARIES ${KOKKOS_INT_LIBRARIES})		SET_PROPERTY(GLOBAL PROPERTY KOKKOS_INT_LIBRARIES ${KOKKOS_INT_LIBRARIES})

	GET_DIRECTORY_PROPERTY(HAS_PARENT PARENT_DIRECTORY)
	IF (KOKKOS_HAS_TRILINOS)		IF (KOKKOS_HAS_TRILINOS)
	SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})		SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
	SET(KOKKOS_HEADER_DIR ${TRILINOS_INCDIR})		SET(KOKKOS_HEADER_DIR ${TRILINOS_INCDIR})
	@@ -203,7 +212,7 @@ IF (KOKKOS_HAS_TRILINOS)
	SET(KOKKOSCORE_XCOMPILER_OPTIONS "${KOKKOSCORE_XCOMPILER_OPTIONS} -Xcompiler ${XCOMP_FLAG}")		SET(KOKKOSCORE_XCOMPILER_OPTIONS "${KOKKOSCORE_XCOMPILER_OPTIONS} -Xcompiler ${XCOMP_FLAG}")
	LIST(APPEND KOKKOS_ALL_COMPILE_OPTIONS -Xcompiler ${XCOMP_FLAG})		LIST(APPEND KOKKOS_ALL_COMPILE_OPTIONS -Xcompiler ${XCOMP_FLAG})
	ENDFOREACH()		ENDFOREACH()
	SET(KOKKOSCORE_CXX_FLAGS "${KOKKOSCORE_COMPILE_OPTIONS} ${CMAKE_CXX${KOKKOS_CXX_STANDARD}_STANDARD_COMPILE_OPTION} ${KOKKOSCORE_XCOMPILER_OPTIONS}")		SET(KOKKOSCORE_CXX_FLAGS "${KOKKOSCORE_COMPILE_OPTIONS} ${KOKKOSCORE_XCOMPILER_OPTIONS}")
	IF (KOKKOS_ENABLE_CUDA)		IF (KOKKOS_ENABLE_CUDA)
	STRING(REPLACE ";" " " KOKKOSCORE_CUDA_OPTIONS "${KOKKOS_CUDA_OPTIONS}")		STRING(REPLACE ";" " " KOKKOSCORE_CUDA_OPTIONS "${KOKKOS_CUDA_OPTIONS}")
	FOREACH(CUDAFE_FLAG ${KOKKOS_CUDAFE_OPTIONS})		FOREACH(CUDAFE_FLAG ${KOKKOS_CUDAFE_OPTIONS})
	@@ -246,7 +255,7 @@ KOKKOS_PACKAGE_POSTPROCESS()
	#We are ready to configure the header		#We are ready to configure the header
	CONFIGURE_FILE(cmake/KokkosCore_config.h.in KokkosCore_config.h @ONLY)		CONFIGURE_FILE(cmake/KokkosCore_config.h.in KokkosCore_config.h @ONLY)

	IF (NOT KOKKOS_HAS_TRILINOS)		IF (NOT KOKKOS_HAS_TRILINOS AND NOT Kokkos_INSTALL_TESTING)
	ADD_LIBRARY(kokkos INTERFACE)		ADD_LIBRARY(kokkos INTERFACE)
	#Make sure in-tree projects can reference this as Kokkos::		#Make sure in-tree projects can reference this as Kokkos::
	#to match the installed target names		#to match the installed target names
	@@ -262,8 +271,6 @@ INCLUDE(${KOKKOS_SRC_PATH}/cmake/kokkos_install.cmake)
	# If the argument of DESTINATION is a relative path, CMake computes it		# If the argument of DESTINATION is a relative path, CMake computes it
	# as relative to ${CMAKE_INSTALL_PATH}.		# as relative to ${CMAKE_INSTALL_PATH}.
	INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/bin/nvcc_wrapper DESTINATION ${CMAKE_INSTALL_BINDIR})		INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/bin/nvcc_wrapper DESTINATION ${CMAKE_INSTALL_BINDIR})
	INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/KokkosCore_config.h" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})


	# Finally - if we are a subproject - make sure the enabled devices are visible		# Finally - if we are a subproject - make sure the enabled devices are visible
	IF (HAS_PARENT)		IF (HAS_PARENT)

lib/kokkos/Makefile.kokkos

+168 −167

File changed.

Preview size limit exceeded, changes collapsed.

lib/kokkos/Makefile.targets

+4 −20

Original line number	Original line	Diff line number	Diff line
	@@ -26,21 +26,17 @@ Kokkos_Spinwait.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/impl/Kokkos_Spi
	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/impl/Kokkos_Spinwait.cpp		$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/impl/Kokkos_Spinwait.cpp
	Kokkos_HostBarrier.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/impl/Kokkos_HostBarrier.cpp		Kokkos_HostBarrier.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/impl/Kokkos_HostBarrier.cpp
	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/impl/Kokkos_HostBarrier.cpp		$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/impl/Kokkos_HostBarrier.cpp
	Kokkos_Profiling_Interface.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/impl/Kokkos_Profiling_Interface.cpp		Kokkos_Profiling.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/impl/Kokkos_Profiling.cpp
	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/impl/Kokkos_Profiling_Interface.cpp		$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/impl/Kokkos_Profiling.cpp
	Kokkos_SharedAlloc.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/impl/Kokkos_SharedAlloc.cpp		Kokkos_SharedAlloc.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/impl/Kokkos_SharedAlloc.cpp
	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/impl/Kokkos_SharedAlloc.cpp		$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/impl/Kokkos_SharedAlloc.cpp
	Kokkos_MemoryPool.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/impl/Kokkos_MemoryPool.cpp		Kokkos_MemoryPool.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/impl/Kokkos_MemoryPool.cpp
	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/impl/Kokkos_MemoryPool.cpp		$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/impl/Kokkos_MemoryPool.cpp
			Kokkos_MemorySpace.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/impl/Kokkos_MemorySpace.cpp
			$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/impl/Kokkos_MemorySpace.cpp
	Kokkos_HostSpace_deepcopy.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/impl/Kokkos_HostSpace_deepcopy.cpp		Kokkos_HostSpace_deepcopy.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/impl/Kokkos_HostSpace_deepcopy.cpp
	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/impl/Kokkos_HostSpace_deepcopy.cpp		$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/impl/Kokkos_HostSpace_deepcopy.cpp

	ifeq ($(KOKKOS_INTERNAL_USE_SERIAL), 1)
	ifeq ($(KOKKOS_INTERNAL_ENABLE_ETI), 1)
	include $(KOKKOS_ETI_PATH)/Serial/Makefile.eti_Serial
	endif
	endif

	ifeq ($(KOKKOS_INTERNAL_USE_CUDA), 1)		ifeq ($(KOKKOS_INTERNAL_USE_CUDA), 1)
	Kokkos_Cuda_Instance.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/Cuda/Kokkos_Cuda_Instance.cpp		Kokkos_Cuda_Instance.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/Cuda/Kokkos_Cuda_Instance.cpp
	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/Cuda/Kokkos_Cuda_Instance.cpp		$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/Cuda/Kokkos_Cuda_Instance.cpp
	@@ -50,9 +46,6 @@ Kokkos_Cuda_Task.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/Cuda/Kokkos_Cu
	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/Cuda/Kokkos_Cuda_Task.cpp		$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/Cuda/Kokkos_Cuda_Task.cpp
	Kokkos_Cuda_Locks.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/Cuda/Kokkos_Cuda_Locks.cpp		Kokkos_Cuda_Locks.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/Cuda/Kokkos_Cuda_Locks.cpp
	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/Cuda/Kokkos_Cuda_Locks.cpp		$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/Cuda/Kokkos_Cuda_Locks.cpp
	ifeq ($(KOKKOS_INTERNAL_ENABLE_ETI), 1)
	include $(KOKKOS_ETI_PATH)/Cuda/Makefile.eti_Cuda
	endif
	endif		endif

	ifeq ($(KOKKOS_INTERNAL_USE_HIP), 1)		ifeq ($(KOKKOS_INTERNAL_USE_HIP), 1)
	@@ -75,9 +68,6 @@ Kokkos_ROCm_Task.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/ROCm/Kokkos_RO
	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/ROCm/Kokkos_ROCm_Task.cpp		$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/ROCm/Kokkos_ROCm_Task.cpp
	Kokkos_ROCm_Impl.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/ROCm/Kokkos_ROCm_Impl.cpp		Kokkos_ROCm_Impl.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/ROCm/Kokkos_ROCm_Impl.cpp
	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/ROCm/Kokkos_ROCm_Impl.cpp		$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/ROCm/Kokkos_ROCm_Impl.cpp
	ifeq ($(KOKKOS_INTERNAL_ENABLE_ETI), 1)
	include $(KOKKOS_ETI_PATH)/ROCm/Makefile.eti_ROCm
	endif
	endif		endif

	ifeq ($(KOKKOS_INTERNAL_USE_PTHREADS), 1)		ifeq ($(KOKKOS_INTERNAL_USE_PTHREADS), 1)
	@@ -85,9 +75,6 @@ Kokkos_ThreadsExec_base.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/Threads
	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/Threads/Kokkos_ThreadsExec_base.cpp		$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/Threads/Kokkos_ThreadsExec_base.cpp
	Kokkos_ThreadsExec.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/Threads/Kokkos_ThreadsExec.cpp		Kokkos_ThreadsExec.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/Threads/Kokkos_ThreadsExec.cpp
	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/Threads/Kokkos_ThreadsExec.cpp		$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/Threads/Kokkos_ThreadsExec.cpp
	ifeq ($(KOKKOS_INTERNAL_ENABLE_ETI), 1)
	include $(KOKKOS_ETI_PATH)/Threads/Makefile.eti_Threads
	endif
	endif		endif

	ifeq ($(KOKKOS_INTERNAL_USE_OPENMP), 1)		ifeq ($(KOKKOS_INTERNAL_USE_OPENMP), 1)
	@@ -95,9 +82,6 @@ Kokkos_OpenMP_Exec.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/OpenMP/Kokko
	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/OpenMP/Kokkos_OpenMP_Exec.cpp		$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/OpenMP/Kokkos_OpenMP_Exec.cpp
	Kokkos_OpenMP_Task.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/OpenMP/Kokkos_OpenMP_Task.cpp		Kokkos_OpenMP_Task.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/OpenMP/Kokkos_OpenMP_Task.cpp
	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/OpenMP/Kokkos_OpenMP_Task.cpp		$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/OpenMP/Kokkos_OpenMP_Task.cpp
	ifeq ($(KOKKOS_INTERNAL_ENABLE_ETI), 1)
	include $(KOKKOS_ETI_PATH)/OpenMP/Makefile.eti_OpenMP
	endif
	endif		endif

	ifeq ($(KOKKOS_INTERNAL_USE_HPX), 1)		ifeq ($(KOKKOS_INTERNAL_USE_HPX), 1)

Admin message