Skip to content

changes to accomodate for cuda 13 (NCCL) #42

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

Closed
prateekchawla168 wants to merge 1 commit into from
Closed

changes to accomodate for cuda 13 (NCCL) #42

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
8 changes: 4 additions & 4 deletions 08-H_NCCL_NVSHMEM/.master/NCCL/Makefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) 2021-2024, NVIDIA CORPORATION. All rights reserved.
THIS_TASK := 08H-NCCL-@@TASKSOL@@
OUTPUT_NAME := jacobi.$(THIS_TASK)__$(shell date '+%Y%m%d-%H%M')
NP ?= 1
NP ?= 4
NVCC=nvcc
JSC_SUBMIT_CMD ?= srun --cpu-bind=socket --gres=gpu:4 --ntasks-per-node 4
MPICXX=mpicxx
Expand All @@ -23,9 +23,9 @@ ifdef DISABLE_CUB
else
NVCC_FLAGS = -DHAVE_CUB
endif
NVCC_FLAGS += -lineinfo $(GENCODE_FLAGS) -std=c++14
MPICXX_FLAGS = -DUSE_NVTX -I$(CUDA_HOME)/include -I$(NCCL_HOME)/include -std=c++14
LD_FLAGS = -L$(CUDA_HOME)/lib64 -lcudart -lnvToolsExt -lnccl
NVCC_FLAGS += -lineinfo $(GENCODE_FLAGS) -std=c++17 -I$(CUDA_HOME)/include
MPICXX_FLAGS = -DUSE_NVTX -I$(CUDA_HOME)/include -I$(NCCL_HOME)/include -std=c++17
LD_FLAGS = -L$(CUDA_HOME)/lib64 -lcudart -lnccl
jacobi: Makefile jacobi.cpp jacobi_kernels.o
$(MPICXX) $(MPICXX_FLAGS) jacobi.cpp jacobi_kernels.o $(LD_FLAGS) -o jacobi

Expand Down
2 changes: 1 addition & 1 deletion 08-H_NCCL_NVSHMEM/.master/NCCL/jacobi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
#include <cuda_runtime.h>

#ifdef USE_NVTX
#include <nvToolsExt.h>
#include <nvtx3/nvToolsExt.h>

const uint32_t colors[] = {0x0000ff00, 0x000000ff, 0x00ffff00, 0x00ff00ff,
0x0000ffff, 0x00ff0000, 0x00ffffff};
Expand Down
8 changes: 4 additions & 4 deletions 08-H_NCCL_NVSHMEM/solutions/NCCL/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) 2021-2024, NVIDIA CORPORATION. All rights reserved.
THIS_TASK := 08H-NCCL-sol
OUTPUT_NAME := jacobi.$(THIS_TASK)__$(shell date '+%Y%m%d-%H%M')
NP ?= 1
NP ?= 4
NVCC=nvcc
JSC_SUBMIT_CMD ?= srun --cpu-bind=socket --gres=gpu:4 --ntasks-per-node 4
MPICXX=mpicxx
Expand All @@ -23,9 +23,9 @@ ifdef DISABLE_CUB
else
NVCC_FLAGS = -DHAVE_CUB
endif
NVCC_FLAGS += -lineinfo $(GENCODE_FLAGS) -std=c++14
MPICXX_FLAGS = -DUSE_NVTX -I$(CUDA_HOME)/include -I$(NCCL_HOME)/include -std=c++14
LD_FLAGS = -L$(CUDA_HOME)/lib64 -lcudart -lnvToolsExt -lnccl
NVCC_FLAGS += -lineinfo $(GENCODE_FLAGS) -std=c++17 -I$(CUDA_HOME)/include
MPICXX_FLAGS = -DUSE_NVTX -I$(CUDA_HOME)/include -I$(NCCL_HOME)/include -std=c++17
LD_FLAGS = -L$(CUDA_HOME)/lib64 -lcudart -lnccl
jacobi: Makefile jacobi.cpp jacobi_kernels.o
$(MPICXX) $(MPICXX_FLAGS) jacobi.cpp jacobi_kernels.o $(LD_FLAGS) -o jacobi

Expand Down
2 changes: 1 addition & 1 deletion 08-H_NCCL_NVSHMEM/solutions/NCCL/jacobi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
#include <cuda_runtime.h>

#ifdef USE_NVTX
#include <nvToolsExt.h>
#include <nvtx3/nvToolsExt.h>

const uint32_t colors[] = {0x0000ff00, 0x000000ff, 0x00ffff00, 0x00ff00ff,
0x0000ffff, 0x00ff0000, 0x00ffffff};
Expand Down
8 changes: 4 additions & 4 deletions 08-H_NCCL_NVSHMEM/tasks/NCCL/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) 2021-2024, NVIDIA CORPORATION. All rights reserved.
THIS_TASK := 08H-NCCL-task
OUTPUT_NAME := jacobi.$(THIS_TASK)__$(shell date '+%Y%m%d-%H%M')
NP ?= 1
NP ?= 4
NVCC=nvcc
JSC_SUBMIT_CMD ?= srun --cpu-bind=socket --gres=gpu:4 --ntasks-per-node 4
MPICXX=mpicxx
Expand All @@ -23,9 +23,9 @@ ifdef DISABLE_CUB
else
NVCC_FLAGS = -DHAVE_CUB
endif
NVCC_FLAGS += -lineinfo $(GENCODE_FLAGS) -std=c++14
MPICXX_FLAGS = -DUSE_NVTX -I$(CUDA_HOME)/include -I$(NCCL_HOME)/include -std=c++14
LD_FLAGS = -L$(CUDA_HOME)/lib64 -lcudart -lnvToolsExt -lnccl
NVCC_FLAGS += -lineinfo $(GENCODE_FLAGS) -std=c++17 -I$(CUDA_HOME)/include
MPICXX_FLAGS = -DUSE_NVTX -I$(CUDA_HOME)/include -I$(NCCL_HOME)/include -std=c++17
LD_FLAGS = -L$(CUDA_HOME)/lib64 -lcudart -lnccl
jacobi: Makefile jacobi.cpp jacobi_kernels.o
$(MPICXX) $(MPICXX_FLAGS) jacobi.cpp jacobi_kernels.o $(LD_FLAGS) -o jacobi

Expand Down
2 changes: 1 addition & 1 deletion 08-H_NCCL_NVSHMEM/tasks/NCCL/jacobi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
#include <cuda_runtime.h>

#ifdef USE_NVTX
#include <nvToolsExt.h>
#include <nvtx3/nvToolsExt.h>

const uint32_t colors[] = {0x0000ff00, 0x000000ff, 0x00ffff00, 0x00ff00ff,
0x0000ffff, 0x00ff0000, 0x00ffffff};
Expand Down