Merge pull request #2070 from junghans/kokkos_v3.1.01 (5fa7e138) · Commits · 郑智淋 / lammps

cmake/Modules/Packages/KOKKOS.cmake

+3 −6

Original line number	Original line	Diff line number	Diff line
	@@ -35,8 +35,8 @@ if(DOWNLOAD_KOKKOS)
	list(APPEND KOKKOS_LIB_BUILD_ARGS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}")		list(APPEND KOKKOS_LIB_BUILD_ARGS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}")
	include(ExternalProject)		include(ExternalProject)
	ExternalProject_Add(kokkos_build		ExternalProject_Add(kokkos_build
	URL https://github.com/kokkos/kokkos/archive/3.1.00.tar.gz		URL https://github.com/kokkos/kokkos/archive/3.1.01.tar.gz
	URL_MD5 f638a6c786f748a602b26faa0e96ebab		URL_MD5 3ccb2100f7fc316891e7dad3bc33fa37
	CMAKE_ARGS ${KOKKOS_LIB_BUILD_ARGS}		CMAKE_ARGS ${KOKKOS_LIB_BUILD_ARGS}
	BUILD_BYPRODUCTS <INSTALL_DIR>/lib/libkokkoscore.a		BUILD_BYPRODUCTS <INSTALL_DIR>/lib/libkokkoscore.a
	)		)
	@@ -50,10 +50,7 @@ if(DOWNLOAD_KOKKOS)
	target_link_libraries(lammps PRIVATE LAMMPS::KOKKOS)		target_link_libraries(lammps PRIVATE LAMMPS::KOKKOS)
	add_dependencies(LAMMPS::KOKKOS kokkos_build)		add_dependencies(LAMMPS::KOKKOS kokkos_build)
	elseif(EXTERNAL_KOKKOS)		elseif(EXTERNAL_KOKKOS)
	find_package(Kokkos 3.1)		find_package(Kokkos 3.1.01 REQUIRED CONFIG)
	if(NOT Kokkos_FOUND)
	message(FATAL_ERROR "KOKKOS library version 3.1 or later not found, help CMake to find it by setting KOKKOS_LIBRARY, or set DOWNLOAD_KOKKOS=ON to download it")
	endif()
	target_link_libraries(lammps PRIVATE Kokkos::kokkos)		target_link_libraries(lammps PRIVATE Kokkos::kokkos)
	else()		else()
	set(LAMMPS_LIB_KOKKOS_SRC_DIR ${LAMMPS_LIB_SOURCE_DIR}/kokkos)		set(LAMMPS_LIB_KOKKOS_SRC_DIR ${LAMMPS_LIB_SOURCE_DIR}/kokkos)

lib/kokkos/CHANGELOG.md

+13 −0

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)
			[Full Changelog](https://github.com/kokkos/kokkos/compare/3.1.00...3.1.1)

			Fixed bugs:

			- Fix complex_double misalignment in reduce, clang+CUDA [\#2989](https://github.com/kokkos/kokkos/issues/2989)
			- Fix compilation fails when profiling disabled and CUDA enabled [\#3001](https://github.com/kokkos/kokkos/issues/3001)
			- Fix cuda reduction of non-trivial scalars of size 4 [\#2990](https://github.com/kokkos/kokkos/issues/2990)
			- Configure and install version file when building in Trilinos [\#2957](https://github.com/kokkos/kokkos/pull/2957)
			- Fix OpenMPTarget build missing include and namespace [\#3000](https://github.com/kokkos/kokkos/issues/3000)
			- fix typo in KOKKOS_SET_EXE_PROPERTY() [\#2959](https://github.com/kokkos/kokkos/issues/2959)
			- Fix non-zero span subviews of zero sized subviews [\#2979](https://github.com/kokkos/kokkos/issues/2979)

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

lib/kokkos/CMakeLists.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -103,7 +103,7 @@ ENDIF()

	set(Kokkos_VERSION_MAJOR 3)		set(Kokkos_VERSION_MAJOR 3)
	set(Kokkos_VERSION_MINOR 1)		set(Kokkos_VERSION_MINOR 1)
	set(Kokkos_VERSION_PATCH 0)		set(Kokkos_VERSION_PATCH 1)
	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}")

lib/kokkos/Makefile.kokkos

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -8,7 +8,7 @@ CXXFLAGS=$(CCFLAGS)

	KOKKOS_VERSION_MAJOR = 3		KOKKOS_VERSION_MAJOR = 3
	KOKKOS_VERSION_MINOR = 1		KOKKOS_VERSION_MINOR = 1
	KOKKOS_VERSION_PATCH = 0		KOKKOS_VERSION_PATCH = 1
	KOKKOS_VERSION = $(shell echo $(KOKKOS_VERSION_MAJOR)10000+$(KOKKOS_VERSION_MINOR)100+$(KOKKOS_VERSION_PATCH) \| bc)		KOKKOS_VERSION = $(shell echo $(KOKKOS_VERSION_MAJOR)10000+$(KOKKOS_VERSION_MINOR)100+$(KOKKOS_VERSION_PATCH) \| bc)

	# Options: Cuda,HIP,ROCm,OpenMP,Pthread,Serial		# Options: Cuda,HIP,ROCm,OpenMP,Pthread,Serial

lib/kokkos/cmake/kokkos_install.cmake

+8 −1

Original line number	Original line	Diff line number	Diff line
			INCLUDE(CMakePackageConfigHelpers)
	IF (NOT KOKKOS_HAS_TRILINOS)		IF (NOT KOKKOS_HAS_TRILINOS)
	INCLUDE(GNUInstallDirs)		INCLUDE(GNUInstallDirs)

	@@ -11,7 +12,6 @@ IF (NOT KOKKOS_HAS_TRILINOS)
	"${Kokkos_BINARY_DIR}/KokkosConfig.cmake"		"${Kokkos_BINARY_DIR}/KokkosConfig.cmake"
	INSTALL_DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake)		INSTALL_DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake)

	INCLUDE(CMakePackageConfigHelpers)
	CONFIGURE_PACKAGE_CONFIG_FILE(		CONFIGURE_PACKAGE_CONFIG_FILE(
	cmake/KokkosConfigCommon.cmake.in		cmake/KokkosConfigCommon.cmake.in
	"${Kokkos_BINARY_DIR}/KokkosConfigCommon.cmake"		"${Kokkos_BINARY_DIR}/KokkosConfigCommon.cmake"
	@@ -35,6 +35,13 @@ ELSE()
	CONFIGURE_FILE(cmake/KokkosTrilinosConfig.cmake.in ${Kokkos_BINARY_DIR}/KokkosTrilinosConfig.cmake @ONLY)		CONFIGURE_FILE(cmake/KokkosTrilinosConfig.cmake.in ${Kokkos_BINARY_DIR}/KokkosTrilinosConfig.cmake @ONLY)
	file(READ ${Kokkos_BINARY_DIR}/KokkosTrilinosConfig.cmake KOKKOS_TRILINOS_CONFIG)		file(READ ${Kokkos_BINARY_DIR}/KokkosTrilinosConfig.cmake KOKKOS_TRILINOS_CONFIG)
	file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/KokkosConfig_install.cmake" "${KOKKOS_TRILINOS_CONFIG}")		file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/KokkosConfig_install.cmake" "${KOKKOS_TRILINOS_CONFIG}")

			WRITE_BASIC_PACKAGE_VERSION_FILE("${CMAKE_CURRENT_BINARY_DIR}/KokkosConfigVersion.cmake"
			VERSION "${Kokkos_VERSION}"
			COMPATIBILITY SameMajorVersion)

			install(FILES ${CMAKE_CURRENT_BINARY_DIR}/KokkosConfigVersion.cmake
			DESTINATION "${${PROJECT_NAME}_INSTALL_LIB_DIR}/cmake/${PACKAGE_NAME}")
	ENDIF()		ENDIF()

	INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/KokkosCore_config.h DESTINATION ${KOKKOS_HEADER_DIR})		INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/KokkosCore_config.h DESTINATION ${KOKKOS_HEADER_DIR})

Admin message