From cf9b0dee745e82c1809b1d4dc73dd4aefdf1bdcf Mon Sep 17 00:00:00 2001 From: Weiqun Zhang Date: Mon, 27 Jan 2025 09:36:49 -0800 Subject: [PATCH] GNU Make: Remove old machines like summit and cori --- Tools/GNUMake/Make.machines | 33 -------------- Tools/GNUMake/sites/Make.alcf | 10 ----- Tools/GNUMake/sites/Make.nersc | 80 +--------------------------------- Tools/GNUMake/sites/Make.olcf | 54 +---------------------- 4 files changed, 2 insertions(+), 175 deletions(-) diff --git a/Tools/GNUMake/Make.machines b/Tools/GNUMake/Make.machines index 910af573b10..f40e2aca813 100644 --- a/Tools/GNUMake/Make.machines +++ b/Tools/GNUMake/Make.machines @@ -18,14 +18,6 @@ host_name_short := $(shell hostname -s) # MACHINES supported ifdef NERSC_HOST -ifeq ($(findstring cgpu, $(host_name)), cgpu) - which_site := nersc - which_computer := cgpu -else -ifeq ($(NERSC_HOST), cori) - which_site := nersc - which_computer := cori -else ifeq ($(NERSC_HOST), perlmutter) which_site := nersc which_computer := perlmutter @@ -42,27 +34,8 @@ ifeq ($(NERSC_HOST), muller) which_computer := perlmutter endif endif -endif -endif - -ifdef OLCF_MODULEPATH_ROOT - ifeq ($(findstring summit, $(host_name)), summit) - which_site := olcf - which_computer := summit - endif - - ifeq ($(findstring ascent, $(host_name)), ascent) - which_site := olcf - which_computer := ascent - endif -endif ifeq ($(LMOD_SITE_NAME),OLCF) - ifeq ($(findstring spock, $(host_name)), spock) - which_site := olcf - which_computer := spock - endif - ifeq ($(findstring crusher, $(host_name)), crusher) which_site := olcf which_computer := crusher @@ -75,12 +48,6 @@ ifeq ($(LMOD_SITE_NAME),OLCF) endif ifeq ($(findstring alcf.anl.gov, $(host_name)),alcf.anl.gov) - ifeq ($(findstring theta, $(host_name)), theta) - ifneq ($(findstring thetagpu, $(host_name)), thetagpu) - which_site := alcf - which_computer := theta - endif - endif ifeq ($(findstring polaris, $(host_name)), polaris) which_site := alcf which_computer := polaris diff --git a/Tools/GNUMake/sites/Make.alcf b/Tools/GNUMake/sites/Make.alcf index 89b341bbcb7..58f6cb1485d 100644 --- a/Tools/GNUMake/sites/Make.alcf +++ b/Tools/GNUMake/sites/Make.alcf @@ -1,14 +1,4 @@ -ifeq ($(which_computer),theta) - ifeq ($(USE_MPI),TRUE) - CC = cc - CXX = CC - FC = ftn - F90 = ftn - LIBRARIES += -lmpichf90 - endif -endif - ifeq ($(which_computer),$(filter $(which_computer),polaris)) ifdef PE_ENV diff --git a/Tools/GNUMake/sites/Make.nersc b/Tools/GNUMake/sites/Make.nersc index fb84f3473d6..6fbfaf1ec8d 100644 --- a/Tools/GNUMake/sites/Make.nersc +++ b/Tools/GNUMake/sites/Make.nersc @@ -2,7 +2,7 @@ # For NERSC machines: Cori and corigpu # -NERSC_MACHINES := cori cgpu perlmutter +NERSC_MACHINES := perlmutter ifneq ($(which_computer),$(filter $(which_computer), ${NERSC_MACHINES})) $(error Unknown NERSC computer, $(which_computer)) @@ -119,81 +119,3 @@ ifeq ($(which_computer),$(filter $(which_computer),perlmutter)) endif endif - -ifeq ($(which_computer),$(filter $(which_computer),cori)) - - ifdef PE_ENV - ifneq ($(USE_CUDA),TRUE) - lowercase_peenv := $(shell echo $(PE_ENV) | tr A-Z a-z) - ifneq ($(lowercase_peenv),$(lowercase_comp)) - has_compiler_mismatch = COMP=$(COMP) does not match PrgEnv-$(lowercase_peenv) - endif - endif - endif - - ifeq ($(USE_MPI),TRUE) - ifeq ($(USE_CUDA),TRUE) - $(error USE_CUDA is not allowed on the cori login nodes, please build from a cgpu node)) - else - CC = cc - CXX = CC - FC = ftn - F90 = ftn - LIBRARIES += -lmpichf90 - endif - endif - - ifeq ($(USE_SENSEI_INSITU),TRUE) - CXXFLAGS += -fPIC -dynamic - LIBRARIES += -ldl - endif - -endif - -ifeq ($(which_computer),$(filter $(which_computer),cgpu)) - - ifeq ($(USE_MPI),TRUE) - - CC = mpicc - CXX = mpic++ - FC = mpif90 - F90 = mpif90 - - ifneq ($(LINK_WITH_FORTRAN_COMPILER),TRUE) - ifneq ($(findstring mvapich,$(shell mpif90 -show 2>&1 | tr A-Z a-z)),) - cori_mvapich_link_flags := $(shell mpif90 -link_info) - LIBRARIES += --compiler-options '-fPIC' $(wordlist 2,1024,$(filter-out -m64,$(filter-out -fPIC,$(cori_mvapich_link_flags)))) - else ifneq ($(findstring Open MPI, $(shell mpif90 -showme:version 2>&1)),) - cori_openmpi_link_flags := $(shell mpif90 -showme:link) - LIBRARIES += $(cori_openmpi_link_flags) - endif - endif - - endif - - ifeq ($(USE_CUDA),TRUE) - - FIX_NVCC_PTHREAD=TRUE - - ifneq ($(CUDA_ROOT),) - SYSTEM_CUDA_PATH := $(CUDA_ROOT) - COMPILE_CUDA_PATH := $(CUDA_ROOT) - else ifneq ($(CUDA_HOME),) - SYSTEM_CUDA_PATH := $(CUDA_HOME) - COMPILE_CUDA_PATH := $(CUDA_HOME) - endif - - ifeq ($(findstring :dgx, $(LOADEDMODULES)), :dgx) - CUDA_ARCH = 80 - else - CUDA_ARCH = 70 - endif - - endif - - ifeq ($(USE_SENSEI_INSITU),TRUE) - CXXFLAGS += -fPIC -dynamic - LIBRARIES += -ldl - endif - -endif diff --git a/Tools/GNUMake/sites/Make.olcf b/Tools/GNUMake/sites/Make.olcf index a3eece13f6b..41414311dce 100644 --- a/Tools/GNUMake/sites/Make.olcf +++ b/Tools/GNUMake/sites/Make.olcf @@ -2,64 +2,12 @@ # For Summit et al. at OLCF # -OLCF_MACHINES := summit ascent spock crusher frontier +OLCF_MACHINES := crusher frontier ifneq ($(which_computer), $(findstring $(which_computer), $(OLCF_MACHINES))) $(error Unknown OLCF computer, $(which_computer)) endif -ifeq ($(which_computer),$(filter $(which_computer),summit ascent)) - - ifeq ($(USE_MPI),TRUE) - - CC := mpicc - CXX := mpicxx - FC := mpif90 - F90 := mpif90 - - LIBRARIES += -lmpi_ibm_mpifh -lmpi_ibm - - endif - - ifeq ($(lowercase_comp),gnu) - override XTRALIBS := -lgfortran - endif - - ifeq ($(lowercase_comp),ibm) - override XTRALIBS += -L$(OLCF_XLF_ROOT)/lib -L$(OLCF_XLC_ROOT)/lib - endif - - SYSTEM_CUDA_PATH=$(OLCF_CUDA_ROOT) - - SYSTEM_NVML_PATH=$(OLCF_CUDA_ROOT)/lib64/stubs - - # Specify that we want to build for Volta - - CUDA_ARCH = 70 - COMPILE_CUDA_PATH = $(OLCF_CUDA_ROOT) - -endif - -ifeq ($(which_computer),spock) - ifeq ($(USE_HIP),TRUE) - # MI100 - AMD_ARCH=gfx908 - endif - - ifeq ($(USE_MPI),TRUE) - includes += $(shell CC --cray-print-opts=cflags) - ifneq ($(BL_NO_FORT),TRUE) - LIBRARIES += $(shell ftn --cray-print-opts=libs) - else - LIBRARIES += $(shell CC --cray-print-opts=libs) - endif - # for gpu aware mpi - ifeq ($(USE_HIP),TRUE) - LIBRARIES += $(PE_MPICH_GTL_DIR_amd_gfx908) -lmpi_gtl_hsa - endif - endif -endif - ifeq ($(which_computer),crusher) ifeq ($(USE_HIP),TRUE) # MI250X