more cmake cleanup

E3SM-Project · Jul 26, 2024 · 40e0fd5 · 40e0fd5
1 parent 9119ad9
commit 40e0fd5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 14 deletions.
diff --git a/components/eamxx/cmake/machine-files/docker-scream.cmake b/components/eamxx/cmake/machine-files/docker-scream.cmake
@@ -1,21 +1,13 @@
 include(${CMAKE_CURRENT_LIST_DIR}/common.cmake)
 common_setup()
 
-# include (${EKAT_MACH_FILES_PATH}/kokkos/amd-zen3.cmake)
-# include (${EKAT_MACH_FILES_PATH}/kokkos/openmp.cmake)
-
-include (${EKAT_MACH_FILES_PATH}/kokkos/nvidia-a100.cmake)
-include (${EKAT_MACH_FILES_PATH}/kokkos/cuda.cmake)
-
+include (${EKAT_MACH_FILES_PATH}/kokkos/openmp.cmake)
 set(CMAKE_CXX_FLAGS "-DTHRUST_IGNORE_CUB_VERSION_CHECK" CACHE STRING "" FORCE)
 
-# set(BLAS_LIBRARIES /opt/conda/lib/libblas.so CACHE STRING "")
-# set(LAPACK_LIBRARIES /opt/conda/lib/liblapack.so CACHE STRING "")
-# set(SCREAM_INPUT_ROOT "/storage/inputdata/" CACHE STRING "")
+set(BLAS_LIBRARIES /opt/conda/lib/libblas.so CACHE STRING "")
+set(LAPACK_LIBRARIES /opt/conda/lib/liblapack.so CACHE STRING "")
+set(SCREAM_INPUT_ROOT "/storage/inputdata/" CACHE STRING "")
 set(PYBIND11_PYTHON_VERSION 3.9 CACHE STRING "")
-set(Python_EXECUTABLE /global/homes/a/andrep/.conda/envs/fv3net/bin/python CACHE STRING "" FORCE)
-set(PYTHON_EXECUTABLE /global/homes/a/andrep/.conda/envs/fv3net/bin/python CACHE STRING "" FORCE)
-set(Python_INCLUDE_DIRS /global/homes/a/andrep/.conda/envs/fv3net/include/python3.9 CACHE STRING "" FORCE)
 option (SCREAM_ENABLE_ML_CORRECTION "Whether to enable ML correction parametrization" ON)
 
 if ("${PROJECT_NAME}" STREQUAL "E3SM")
@@ -26,4 +18,4 @@ if ("${PROJECT_NAME}" STREQUAL "E3SM")
   endif()
 else()
   set(CMAKE_Fortran_FLAGS "-fallow-argument-mismatch"  CACHE STRING "" FORCE) # only works with gnu v10 and above
-endif()
+endif()
diff --git a/components/eamxx/cmake/machine-files/pm-gpu.cmake b/components/eamxx/cmake/machine-files/pm-gpu.cmake
@@ -19,7 +19,6 @@ endif()
 include (${EKAT_MACH_FILES_PATH}/mpi/srun.cmake)
 
 set(PYBIND11_PYTHON_VERSION 3.9 CACHE STRING "")
-execute_process(COMMAND conda activate /global/common/software/m4492/fv3net-shared-py39)
 option (SCREAM_ENABLE_ML_CORRECTION "Whether to enable ML correction parametrization" ON)
 set(EKAT_MPI_EXTRA_ARGS "${EKAT_MPI_EXTRA_ARGS} --gpus-per-task=1" CACHE STRING "" FORCE)