From 0965d9da2b11a1611520efe2b7cb4964a77b05fe Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Wed, 29 Mar 2023 17:33:38 -0400 Subject: [PATCH] remove references to LATTE packages in CMake scripts --- cmake/CMakeLists.txt | 5 ++- cmake/Modules/Packages/LATTE.cmake | 54 ------------------------------ cmake/presets/all_off.cmake | 1 - cmake/presets/all_on.cmake | 1 - cmake/presets/download.cmake | 3 +- cmake/presets/mingw-cross.cmake | 1 - cmake/presets/nolib.cmake | 1 - 7 files changed, 3 insertions(+), 63 deletions(-) delete mode 100644 cmake/Modules/Packages/LATTE.cmake diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 6842c05f9d..a71347c2c4 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -257,7 +257,6 @@ set(STANDARD_PACKAGES KIM KSPACE LATBOLTZ - LATTE LEPTON MACHDYN MANIFOLD @@ -441,7 +440,7 @@ if(BUILD_OMP) target_link_libraries(lmp PRIVATE OpenMP::OpenMP_CXX) endif() -if(PKG_MSCG OR PKG_ATC OR PKG_AWPMD OR PKG_ML-QUIP OR PKG_ML-POD OR PKG_LATTE OR PKG_ELECTRODE) +if(PKG_MSCG OR PKG_ATC OR PKG_AWPMD OR PKG_ML-QUIP OR PKG_ML-POD OR PKG_ELECTRODE) enable_language(C) if (NOT USE_INTERNAL_LINALG) find_package(LAPACK) @@ -521,7 +520,7 @@ else() endif() foreach(PKG_WITH_INCL KSPACE PYTHON ML-IAP VORONOI COLVARS ML-HDNNP MDI MOLFILE NETCDF - PLUMED QMMM ML-QUIP SCAFACOS MACHDYN VTK KIM LATTE MSCG COMPRESS ML-PACE LEPTON) + PLUMED QMMM ML-QUIP SCAFACOS MACHDYN VTK KIM MSCG COMPRESS ML-PACE LEPTON) if(PKG_${PKG_WITH_INCL}) include(Packages/${PKG_WITH_INCL}) endif() diff --git a/cmake/Modules/Packages/LATTE.cmake b/cmake/Modules/Packages/LATTE.cmake deleted file mode 100644 index bedd7a64fc..0000000000 --- a/cmake/Modules/Packages/LATTE.cmake +++ /dev/null @@ -1,54 +0,0 @@ -enable_language(Fortran) - -# using lammps in a super-build setting -if(TARGET LATTE::latte) - target_link_libraries(lammps PRIVATE LATTE::latte) - return() -endif() - -find_package(LATTE 1.2.2 CONFIG) -if(LATTE_FOUND) - set(DOWNLOAD_LATTE_DEFAULT OFF) -else() - set(DOWNLOAD_LATTE_DEFAULT ON) -endif() -option(DOWNLOAD_LATTE "Download the LATTE library instead of using an already installed one" ${DOWNLOAD_LATTE_DEFAULT}) -if(DOWNLOAD_LATTE) - message(STATUS "LATTE download requested - we will build our own") - set(LATTE_URL "https://github.com/lanl/LATTE/archive/v1.2.2.tar.gz" CACHE STRING "URL for LATTE tarball") - set(LATTE_MD5 "820e73a457ced178c08c71389a385de7" CACHE STRING "MD5 checksum of LATTE tarball") - mark_as_advanced(LATTE_URL) - mark_as_advanced(LATTE_MD5) - GetFallbackURL(LATTE_URL LATTE_FALLBACK) - - # CMake cannot pass BLAS or LAPACK library variable to external project if they are a list - list(LENGTH BLAS_LIBRARIES} NUM_BLAS) - list(LENGTH LAPACK_LIBRARIES NUM_LAPACK) - if((NUM_BLAS GREATER 1) OR (NUM_LAPACK GREATER 1) AND NOT USE_INTERNAL_LINALG) - message(FATAL_ERROR "Cannot compile downloaded LATTE library due to a technical limitation. " - "Try to configure LAMMPS with '-D USE_INTERNAL_LINALG=on' added as a workaround.") - endif() - - include(ExternalProject) - ExternalProject_Add(latte_build - URL ${LATTE_URL} ${LATTE_FALLBACK} - URL_MD5 ${LATTE_MD5} - SOURCE_SUBDIR cmake - CMAKE_ARGS -DCMAKE_INSTALL_PREFIX= ${CMAKE_REQUEST_PIC} -DCMAKE_INSTALL_LIBDIR=lib - -DBLAS_LIBRARIES=${BLAS_LIBRARIES} -DLAPACK_LIBRARIES=${LAPACK_LIBRARIES} - -DCMAKE_Fortran_COMPILER=${CMAKE_Fortran_COMPILER} -DCMAKE_Fortran_FLAGS=${CMAKE_Fortran_FLAGS} - -DCMAKE_Fortran_FLAGS_${BTYPE}=${CMAKE_Fortran_FLAGS_${BTYPE}} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} - -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} - BUILD_BYPRODUCTS /lib/liblatte.a - ) - ExternalProject_get_property(latte_build INSTALL_DIR) - add_library(LAMMPS::LATTE UNKNOWN IMPORTED) - set_target_properties(LAMMPS::LATTE PROPERTIES - IMPORTED_LOCATION "${INSTALL_DIR}/lib/liblatte.a" - INTERFACE_LINK_LIBRARIES "${LAPACK_LIBRARIES}") - target_link_libraries(lammps PRIVATE LAMMPS::LATTE) - add_dependencies(LAMMPS::LATTE latte_build) -else() - find_package(LATTE 1.2.2 REQUIRED CONFIG) - target_link_libraries(lammps PRIVATE LATTE::latte) -endif() diff --git a/cmake/presets/all_off.cmake b/cmake/presets/all_off.cmake index 3d5ee95b3d..2db615f533 100644 --- a/cmake/presets/all_off.cmake +++ b/cmake/presets/all_off.cmake @@ -43,7 +43,6 @@ set(ALL_PACKAGES KOKKOS KSPACE LATBOLTZ - LATTE LEPTON MACHDYN MANIFOLD diff --git a/cmake/presets/all_on.cmake b/cmake/presets/all_on.cmake index 474051f6ec..79444f96aa 100644 --- a/cmake/presets/all_on.cmake +++ b/cmake/presets/all_on.cmake @@ -45,7 +45,6 @@ set(ALL_PACKAGES KOKKOS KSPACE LATBOLTZ - LATTE LEPTON MACHDYN MANIFOLD diff --git a/cmake/presets/download.cmake b/cmake/presets/download.cmake index 2030a97dbb..13b93569f9 100644 --- a/cmake/presets/download.cmake +++ b/cmake/presets/download.cmake @@ -1,14 +1,13 @@ # Preset that turns on packages with automatic downloads of sources or potentials. # Compilation of libraries like Plumed or ScaFaCoS can take a considerable amount of time. -set(ALL_PACKAGES KIM LATTE MSCG VORONOI PLUMED SCAFACOS MACHDYN MESONT MDI ML-PACE) +set(ALL_PACKAGES KIM MSCG VORONOI PLUMED SCAFACOS MACHDYN MESONT MDI ML-PACE) foreach(PKG ${ALL_PACKAGES}) set(PKG_${PKG} ON CACHE BOOL "" FORCE) endforeach() set(DOWNLOAD_KIM ON CACHE BOOL "" FORCE) -set(DOWNLOAD_LATTE ON CACHE BOOL "" FORCE) set(DOWNLOAD_MDI ON CACHE BOOL "" FORCE) set(DOWNLOAD_MSCG ON CACHE BOOL "" FORCE) set(DOWNLOAD_VORO ON CACHE BOOL "" FORCE) diff --git a/cmake/presets/mingw-cross.cmake b/cmake/presets/mingw-cross.cmake index 6c6170acd3..85f61be95b 100644 --- a/cmake/presets/mingw-cross.cmake +++ b/cmake/presets/mingw-cross.cmake @@ -35,7 +35,6 @@ set(WIN_PACKAGES INTEL INTERLAYER KSPACE - LATTE LEPTON MACHDYN MANIFOLD diff --git a/cmake/presets/nolib.cmake b/cmake/presets/nolib.cmake index 00a69cd22d..0e1b09b6cc 100644 --- a/cmake/presets/nolib.cmake +++ b/cmake/presets/nolib.cmake @@ -12,7 +12,6 @@ set(PACKAGES_WITH_LIB KIM KOKKOS LATBOLTZ - LATTE LEPTON MACHDYN MDI