Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update Makefile in GPU examples to set default values for CUDA-relevant variables #259

Open
wants to merge 1 commit into
base: gpu
Choose a base branch
from
Open

update Makefile in GPU examples to set default values for CUDA-relevant variables #259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 4 additions & 9 deletions examples/GPU/acoustics_2d_adjoint/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,26 +22,24 @@ PLOTDIR = _plots # Directory for plots
OVERWRITE ?= True # False ==> make a copy of OUTDIR first
RESTART ?= False # Should = clawdata.restart in setrun

FC = pgi
USE_CUDA = TRUE
# FC = gfortran
# USE_CUDA = FALSE
FC = pgi
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems like this would be more consistent with our other usage if you set

FC ?= pgfortran

here and in other application makefiles. See my comment on clawpack/clawutil#141

CUDA_PATH ?= /usr/local/cuda-10.0
CUDA_VERSION ?= 10.0
CUDA_CC ?= cc60


# DEBUG = TRUE
DEBUG = FALSE

CC = pgi
USE_CPP = TRUE

PROFILE = TRUE
# PROFILE = FALSE

USE_OPENMP = TRUE

VERBOSE = FALSE

# USE_DOUBLE_PRECISION = FALSE
USE_DOUBLE_PRECISION = TRUE

DIM = 2
Expand All @@ -51,9 +49,6 @@ NUM_COEFFS = 0
USE_FWAVES = FALSE
USE_CAPA = FALSE

# Environment variable FC should be set to fortran compiler, e.g. gfortran


# Compiler flags can be specified here or set as an environment variable
FFLAGS ?=

Expand Down
13 changes: 4 additions & 9 deletions examples/GPU/acoustics_2d_heterogeneous_radial/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,26 +21,24 @@ PLOTDIR = _plots # Directory for plots

OVERWRITE ?= True # False ==> make a copy of OUTDIR first

FC = pgi
USE_CUDA = TRUE
# FC = gfortran
# USE_CUDA = FALSE
FC = pgi
CUDA_PATH ?= /usr/local/cuda-10.0
CUDA_VERSION ?= 10.0
CUDA_CC ?= cc60


# DEBUG = TRUE
DEBUG = FALSE

CC = pgi
USE_CPP = TRUE

PROFILE = TRUE
# PROFILE = FALSE

USE_OPENMP = TRUE

VERBOSE = FALSE

# USE_DOUBLE_PRECISION = FALSE
USE_DOUBLE_PRECISION = TRUE

DIM = 2
Expand All @@ -50,9 +48,6 @@ NUM_COEFFS = 2
USE_FWAVES = FALSE
USE_CAPA = FALSE

# Environment variable FC should be set to fortran compiler, e.g. gfortran


# Compiler flags can be specified here or set as an environment variable
FFLAGS ?=

Expand Down
13 changes: 4 additions & 9 deletions examples/GPU/acoustics_2d_homogeneous_radial/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,26 +21,24 @@ PLOTDIR = _plots # Directory for plots

OVERWRITE ?= True # False ==> make a copy of OUTDIR first

FC = pgi
USE_CUDA = TRUE
# FC = gfortran
# USE_CUDA = FALSE
FC = pgi
CUDA_PATH ?= /usr/local/cuda-10.0
CUDA_VERSION ?= 10.0
CUDA_CC ?= cc60


# DEBUG = TRUE
DEBUG = FALSE

CC = pgi
USE_CPP = TRUE

PROFILE = TRUE
# PROFILE = FALSE

USE_OPENMP = TRUE

VERBOSE = FALSE

# USE_DOUBLE_PRECISION = FALSE
USE_DOUBLE_PRECISION = TRUE

DIM = 2
Expand All @@ -50,9 +48,6 @@ NUM_COEFFS = 0
USE_FWAVES = FALSE
USE_CAPA = FALSE

# Environment variable FC should be set to fortran compiler, e.g. gfortran


# Compiler flags can be specified here or set as an environment variable
FFLAGS ?=

Expand Down
13 changes: 4 additions & 9 deletions examples/GPU/shallow_water_no_topography/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,26 +21,24 @@ PLOTDIR = _plots # Directory for plots

OVERWRITE ?= True # False ==> make a copy of OUTDIR first

FC = pgi
USE_CUDA = TRUE
# FC = gfortran
# USE_CUDA = FALSE
FC = pgi
CUDA_PATH ?= /usr/local/cuda-10.0
CUDA_VERSION ?= 10.0
CUDA_CC ?= cc60


# DEBUG = TRUE
DEBUG = FALSE

CC = pgi
USE_CPP = TRUE

PROFILE = TRUE
# PROFILE = FALSE

USE_OPENMP = TRUE

VERBOSE = FALSE

# USE_DOUBLE_PRECISION = FALSE
USE_DOUBLE_PRECISION = TRUE

DIM = 2
Expand All @@ -50,9 +48,6 @@ NUM_COEFFS = 0
USE_FWAVES = FALSE
USE_CAPA = FALSE

# Environment variable FC should be set to fortran compiler, e.g. gfortran


# Compiler flags can be specified here or set as an environment variable
FFLAGS ?=

Expand Down
12 changes: 4 additions & 8 deletions examples/GPU/shallow_water_topo_bowl_radial/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,26 +21,24 @@ PLOTDIR = _plots # Directory for plots

OVERWRITE ?= True # False ==> make a copy of OUTDIR first

FC = pgi
USE_CUDA = TRUE
# FC = gfortran
# USE_CUDA = FALSE
FC = pgi
CUDA_PATH ?= /usr/local/cuda-10.0
CUDA_VERSION ?= 10.0
CUDA_CC ?= cc60


# DEBUG = TRUE
DEBUG = FALSE

CC = pgi
USE_CPP = TRUE

PROFILE = TRUE
# PROFILE = FALSE

USE_OPENMP = TRUE

VERBOSE = FALSE

# USE_DOUBLE_PRECISION = FALSE
USE_DOUBLE_PRECISION = TRUE

DIM = 2
Expand All @@ -49,8 +47,6 @@ NUM_WAVES = 3
NUM_COEFFS = 1
USE_FWAVES = TRUE

# Environment variable FC should be set to fortran compiler, e.g. gfortran


# Compiler flags can be specified here or set as an environment variable
FFLAGS ?=
Expand Down
12 changes: 4 additions & 8 deletions examples/GPU/shallow_water_topo_flat_bottom/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,26 +21,24 @@ PLOTDIR = _plots # Directory for plots

OVERWRITE ?= True # False ==> make a copy of OUTDIR first

FC = pgi
USE_CUDA = TRUE
# FC = gfortran
# USE_CUDA = FALSE
FC = pgi
CUDA_PATH ?= /usr/local/cuda-10.0
CUDA_VERSION ?= 10.0
CUDA_CC ?= cc60


# DEBUG = TRUE
DEBUG = FALSE

CC = pgi
USE_CPP = TRUE

PROFILE = TRUE
# PROFILE = FALSE

USE_OPENMP = TRUE

VERBOSE = FALSE

# USE_DOUBLE_PRECISION = FALSE
USE_DOUBLE_PRECISION = TRUE

DIM = 2
Expand All @@ -49,8 +47,6 @@ NUM_WAVES = 3
NUM_COEFFS = 1
USE_FWAVES = TRUE

# Environment variable FC should be set to fortran compiler, e.g. gfortran


# Compiler flags can be specified here or set as an environment variable
FFLAGS ?=
Expand Down