update arch files to use _USE_NVTX

cjknight · Jun 3, 2024 · 1417609 · 1417609
1 parent 71955f3
commit 1417609
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/gpu/src/arch/midway b/gpu/src/arch/midway
@@ -12,7 +12,7 @@ CXXFLAGS += $(PYTHON_INC)
 CXXFLAGS += -D_USE_GPU -D_GPU_CUDA
 CXXFLAGS += -I$(CUDA_HOME)/include
 #CXXFLAGS += -D_SIMPLE_TIMER
-CXXFLAGS += -D_CUDA_NVTX
+CXXFLAGS += -D_USE_NVTX
 
 CUDA_CXXFLAGS = $(PYTHON_INC)
 CUDA_CXXFLAGS += -arch=sm_37
@@ -21,7 +21,7 @@ CUDA_CXXFLAGS += -Xcompiler -fopenmp
 CUDA_CXXFLAGS += -D_USE_GPU -D_GPU_CUDA
 CUDA_CXXFLAGS += -I$(CUDA_HOME)/include
 #CUDA_CXXFLAGS += -D_SIMPLE_TIMER
-CUDA_CXXFLAGS += -D_CUDA_NVTX
+CUDA_CXXFLAGS += -D_USE_NVTX
 
 LD = $(CXX)
 LDFLAGS = -fopenmp 

diff --git a/gpu/src/arch/polaris b/gpu/src/arch/polaris
@@ -11,7 +11,7 @@ CXXFLAGS += $(PYTHON_INC)
 
 CXXFLAGS += -D_USE_GPU -D_GPU_CUDA
 CXXFLAGS += -D_SIMPLE_TIMER
-CXXFLAGS += -D_CUDA_NVTX
+CXXFLAGS += -D_USE_NVTX
 
 LD = $(CXX)
 LDFLAGS = -mp -cuda

diff --git a/gpu/src/arch/polaris-gnu-nvcc b/gpu/src/arch/polaris-gnu-nvcc
@@ -19,7 +19,7 @@ CXXFLAGS += $(PYTHON_INC)
 CXXFLAGS += -D_USE_GPU -D_GPU_CUDA
 CXXFLAGS += -I$(PATH_TO_CUDA)/include
 #CXXFLAGS += -D_SIMPLE_TIMER
-CXXFLAGS += -D_CUDA_NVTX
+CXXFLAGS += -D_USE_NVTX
 
 CUDA_CXXFLAGS = $(PYTHON_INC)
 #CUDA_CXXFLAGS += --dryrun
@@ -29,7 +29,7 @@ CUDA_CXXFLAGS += -Xcompiler -fopenmp
 CUDA_CXXFLAGS += -D_USE_GPU -D_GPU_CUDA
 CUDA_CXXFLAGS += -I$(PATH_TO_CUDA)/include
 #CUDA_CXXFLAGS += -D_SIMPLE_TIMER
-CUDA_CXXFLAGS += -D_CUDA_NVTX
+CUDA_CXXFLAGS += -D_USE_NVTX
 
 LD = $(CXX)
 LDFLAGS = -g -fopenmp 

diff --git a/gpu/src/arch/polaris-llvm b/gpu/src/arch/polaris-llvm
@@ -20,13 +20,13 @@ CXXFLAGS += -D_USE_GPU -D_GPU_OPENMP
 CXXFLAGS += $(GPU_FLAGS)
 #CXXFLAGS += -I$(CUDA)/include
 CXXFLAGS += -D_SIMPLE_TIMER
-CXXFLAGS += -D_CUDA_NVTX
+CXXFLAGS += -D_USE_NVTX
 
 CUDA_CXX = mpicxx
 CUDA_CXXFLAGS += -fopenmp -fopenmp-targets=nvptx64-nvidia-cuda
 CUDA_CXXFLAGS += -D_USE_GPU -D_GPU_OPENMP
 CUDA_CXXFLAGS += -D_SIMPLE_TIMER
-CUDA_CXXFLAGS += -D_CUDA_NVTX
+CUDA_CXXFLAGS += -D_USE_NVTX
 
 LD = $(CXX)
 LDFLAGS = $(GPU_FLAGS)

diff --git a/gpu/src/arch/polaris-nvhpc-openmp b/gpu/src/arch/polaris-nvhpc-openmp
@@ -29,7 +29,7 @@ CXXFLAGS += -D_USE_GPU -D_GPU_OPENMP
 CXXFLAGS += -O3 $(GPU_FLAGS)
 #CXXFLAGS += -I/soft/compilers/cudatoolkit/cuda-11.4.4/include
 CXXFLAGS += -D_SIMPLE_TIMER
-CXXFLAGS += -D_CUDA_NVTX
+CXXFLAGS += -D_USE_NVTX
 
 LD = $(CXX)
 LDFLAGS = $(GPU_FLAGS)