Skip to content

Commit

Permalink
GNUMake: Merge Ascent and Peak with Summit (#1493)
Browse files Browse the repository at this point in the history
## Summary

These are all systems with the same architecture so we can share the build setup.

## Checklist

The proposed changes:
- [ ] fix a bug or incorrect behavior in AMReX
- [ ] add new capabilities to AMReX
- [ ] changes answers in the test suite to more than roundoff level
- [ ] are likely to significantly affect the results of downstream AMReX users
- [ ] are described in the proposed changes to the AMReX documentation, if appropriate
  • Loading branch information
maximumcats authored Nov 3, 2020
1 parent 43f112f commit ee3076a
Showing 1 changed file with 1 addition and 46 deletions.
47 changes: 1 addition & 46 deletions Tools/GNUMake/sites/Make.olcf
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ endif



ifeq ($(which_computer),$(filter $(which_computer),summit))
ifeq ($(which_computer),$(filter $(which_computer),summit ascent peak))

ifeq ($(USE_MPI),TRUE)

Expand All @@ -72,9 +72,6 @@ ifeq ($(which_computer),$(filter $(which_computer),summit))
override XTRALIBS += -L$(OLCF_XLF_ROOT)/lib -L$(OLCF_XLC_ROOT)/lib
endif

# If the cuda module is loaded, CUDAPATH is set as the toolkit location.
# No longer the case
# SYSTEM_CUDA_PATH=$(CUDAPATH)
SYSTEM_CUDA_PATH=$(OLCF_CUDA_ROOT)

SYSTEM_NVML_PATH=$(OLCF_CUDA_ROOT)/lib64/stubs
Expand All @@ -90,45 +87,3 @@ ifeq ($(which_computer),$(filter $(which_computer),summit))
GPUS_PER_SOCKET=3

endif


ifeq ($(which_computer),$(filter $(which_computer),ascent peak))

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

# If the cuda module is loaded, CUDAPATH is set as the toolkit location.

SYSTEM_CUDA_PATH=$(CUDAPATH)

SYSTEM_NVML_PATH=/usr/lib64/nvidia

# Specify that we want to build for Volta

CUDA_ARCH = 70
COMPILE_CUDA_PATH = $(OLCF_CUDA_ROOT)

# Provide system configuration information.

GPUS_PER_NODE=6
GPUS_PER_SOCKET=3

CPATH=/autofs/nccsopen-svm1_sw/ascent/.swci/1-compute/opt/spack/20180914/linux-rhel7-ppc64le/pgi-18.7/spectrum-mpi-10.2.0.7-20180830-d6ufwv3i4tohn6fq552fpz6au5ik33ok/include:/sw/ascent/cuda/9.1.85/include

endif

0 comments on commit ee3076a

Please sign in to comment.