Merge branch 'fetch-potentials' into feature-cnt (d61d8899) · Commits · 郑智淋 / lammps

cmake/CMakeLists.txt

+10 −1

Original line number	Diff line number	Diff line
		@@ -126,7 +126,7 @@ set(STANDARD_PACKAGES ASPHERE BODY CLASS2 COLLOID COMPRESS DIPOLE
		REPLICA RIGID SHOCK SPIN SNAP SRD KIM PYTHON MSCG MPIIO VORONOI
		USER-ATC USER-AWPMD USER-BOCS USER-CGDNA USER-MESODPD USER-CGSDK USER-COLVARS
		USER-DIFFRACTION USER-DPD USER-DRUDE USER-EFF USER-FEP USER-H5MD USER-LB
		USER-MANIFOLD USER-MEAMC USER-MGPT USER-MISC USER-MOFFF USER-MOLFILE
		USER-MANIFOLD USER-MEAMC USER-MESONT USER-MGPT USER-MISC USER-MOFFF USER-MOLFILE
		USER-NETCDF USER-PHONON USER-PLUMED USER-PTM USER-QTB USER-REACTION
		USER-REAXC USER-SCAFACOS USER-SDPD USER-SMD USER-SMTBQ USER-SPH USER-TALLY
		USER-UEF USER-VTK USER-QUIP USER-QMMM USER-YAFF USER-ADIOS USER-MESONT)
		@@ -365,6 +365,15 @@ target_link_libraries(lammps PRIVATE ${MATH_LIBRARIES})
		include(StyleHeaderUtils)
		RegisterStyles(${LAMMPS_SOURCE_DIR})

		########################################################
		# Fetch missing external files and archives for packages
		########################################################
		foreach(PKG ${STANDARD_PACKAGES} ${SUFFIX_PACKAGES})
		if(PKG_${PKG})
		FetchPotentials(${LAMMPS_SOURCE_DIR}/${PKG} ${LAMMPS_POTENTIALS_DIR})
		endif()
		endforeach()

		##############################################
		# add sources of enabled packages
		############################################

+17 −0

Original line number	Diff line number	Diff line
		@@ -85,3 +85,20 @@ function(GenerateBinaryHeader varname outfile files)
		file(APPEND ${outfile} "const unsigned int ${varname}_size = sizeof(${varname});\n")
		endforeach()
		endfunction(GenerateBinaryHeader)

		# fetch missing potential files
		function(FetchPotentials pkgfolder potfolder)
		if (EXISTS "${pkgfolder}/potentials.txt")
		set(LAMMPS_POTENTIALS_URL "https://download.lammps.org/potentials")
		file(STRINGS "${pkgfolder}/potentials.txt" linelist REGEX "^[^#].")
		foreach(line ${linelist})
		string(FIND ${line} " " blank)
		math(EXPR plusone "${blank}+1")
		string(SUBSTRING ${line} 0 ${blank} pot)
		string(SUBSTRING ${line} ${plusone} -1 sum)
		message(STATUS "Checking external potential ${pot} from ${LAMMPS_POTENTIALS_URL}")
		file(DOWNLOAD "${LAMMPS_POTENTIALS_URL}/${pot}.${sum}" "${LAMMPS_POTENTIALS_DIR}/${pot}"
		EXPECTED_HASH MD5=${sum} SHOW_PROGRESS)
		endforeach()
		endif()
		endfunction(FetchPotentials)

+1 −1

Original line number	Diff line number	Diff line
		@@ -126,7 +126,7 @@ if(GPU_API STREQUAL "CUDA")
		elseif(GPU_API STREQUAL "OPENCL")
		if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
		# download and unpack support binaries for compilation of windows binaries.
		set(LAMMPS_THIRDPARTY_URL "http://download.lammps.org/thirdparty")
		set(LAMMPS_THIRDPARTY_URL "https://download.lammps.org/thirdparty")
		file(DOWNLOAD "${LAMMPS_THIRDPARTY_URL}/opencl-win-devel.tar.gz" "${CMAKE_CURRENT_BINARY_DIR}/opencl-win-devel.tar.gz"
		EXPECTED_MD5 2c00364888d5671195598b44c2e0d44d)
		execute_process(COMMAND ${CMAKE_COMMAND} -E tar xzf opencl-win-devel.tar.gz WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})

+1 −1

Original line number	Diff line number	Diff line
		@@ -9,7 +9,7 @@ if(DOWNLOAD_EIGEN3)
		message(STATUS "Eigen3 download requested - we will build our own")
		include(ExternalProject)
		ExternalProject_Add(Eigen3_build
		URL http://bitbucket.org/eigen/eigen/get/3.3.7.tar.gz
		URL https://bitbucket.org/eigen/eigen/get/3.3.7.tar.gz
		URL_MD5 f2a417d083fe8ca4b8ed2bc613d20f07
		CONFIGURE_COMMAND "" BUILD_COMMAND "" INSTALL_COMMAND ""
		)

100755 → 100644

+0 −0

File mode changed from 100755 to 100644.