Skip to content

Test building improvements #9

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

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Test building improvements #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b945952
Make test Makefile pick up the environment
LourensVeen Oct 31, 2023
c0552c3
Fix symlinking error on repeated builds
LourensVeen Oct 31, 2023
a31cfb7
Add .gitignore for the test directory
LourensVeen Oct 31, 2023
11353e6
Also update the OpenCL test makefile
LourensVeen Nov 2, 2023
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
2 changes: 2 additions & 0 deletions testCodes/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
test_*
CUDA
35 changes: 16 additions & 19 deletions testCodes/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
CXX = g++
CC = gcc
LD = g++
F90 = ifort
CXX ?= g++

.SUFFIXES: .o .cpp .ptx .cu

Expand All @@ -10,12 +7,12 @@ SAPLIB2 = sapporo
SAPLIB = lib$(SAPLIB2).a


CUDA_TK = /usr/local/cuda
CUDA_TK ?= /usr/local/cuda

OFLAGS = -g -O3 -Wall -fopenmp -Wextra -Wstrict-aliasing=2 -fopenmp
CXXFLAGS = -fPIC $(OFLAGS) -I$(CUDA_TK)/include
OFLAGS = -g -O3 -Wall -Wextra -Wstrict-aliasing=2 -fopenmp
CXXFLAGS += -fPIC -fopenmp $(OFLAGS) -I$(CUDA_TK)/include

LDFLAGS = -lcuda -fopenmp -L$(CUDA_TK)/lib64
LDFLAGS += -lcuda -fopenmp -L$(CUDA_TK)/lib64

INCLUDEPATH = $(SAPPOROPATH)/include
CXXFLAGS += -I$(INCLUDEPATH) -I./ -I $(SAPPOROPATH)
Expand All @@ -31,42 +28,42 @@ all: $(OBJ) $(PROG) kernels


kernels:
ln -s $(SAPPOROPATH)/CUDAKernels/ CUDA/
rm -f CUDA && ln -s $(SAPPOROPATH)/CUDAKernels CUDA

#$(PROG): $(OBJ)
# $(LD) $(LDFLAGS) $^ -o $@ -L $(SAPPOROPATH) -lsapporo
# $(CXX) $(LDFLAGS) $^ -o $@ -L $(SAPPOROPATH) -lsapporo

test_gravity_block_cuda : test_gravity_block.o
$(LD) $(LDFLAGS) $^ -o $@ -L $(SAPPOROPATH) -l$(SAPLIB2) $(LDFLAGS)
$(CXX) $(LDFLAGS) $^ -o $@ -L $(SAPPOROPATH) -l$(SAPLIB2) $(LDFLAGS)

test_gravity_block_g5_cuda: test_gravity_block_g5.o
$(LD) $(LDFLAGS) $^ -o $@ -L $(SAPPOROPATH) -l$(SAPLIB2) $(LDFLAGS)
$(CXX) $(LDFLAGS) $^ -o $@ -L $(SAPPOROPATH) -l$(SAPLIB2) $(LDFLAGS)

test_gravity_block_6th_cuda : test_gravity_block_6th.o
$(LD) $(LDFLAGS) $^ -o $@ -L $(SAPPOROPATH) -l$(SAPLIB2) $(LDFLAGS)
$(CXX) $(LDFLAGS) $^ -o $@ -L $(SAPPOROPATH) -l$(SAPLIB2) $(LDFLAGS)

test_performance_rangeN_cuda : test_performance_rangeN.o
$(LD) $(LDFLAGS) $^ -o $@ -L $(SAPPOROPATH) -l$(SAPLIB2) $(LDFLAGS)
$(CXX) $(LDFLAGS) $^ -o $@ -L $(SAPPOROPATH) -l$(SAPLIB2) $(LDFLAGS)

test_performance_blockStep_cuda : test_performance_blockStep.o
$(LD) $(LDFLAGS) $^ -o $@ -L $(SAPPOROPATH) -l$(SAPLIB2) $(LDFLAGS)
$(CXX) $(LDFLAGS) $^ -o $@ -L $(SAPPOROPATH) -l$(SAPLIB2) $(LDFLAGS)

test_performance_rangeN_6th_cuda : test_performance_rangeN_6th.o
$(LD) $(LDFLAGS) $^ -o $@ -L $(SAPPOROPATH) -l$(SAPLIB2) $(LDFLAGS)
$(CXX) $(LDFLAGS) $^ -o $@ -L $(SAPPOROPATH) -l$(SAPLIB2) $(LDFLAGS)

test_performance_rangeN_g5_cuda : test_performance_rangeN_g5.o
$(LD) $(LDFLAGS) $^ -o $@ -L $(SAPPOROPATH) -l$(SAPLIB2) $(LDFLAGS)
$(CXX) $(LDFLAGS) $^ -o $@ -L $(SAPPOROPATH) -l$(SAPLIB2) $(LDFLAGS)

test_integrator_cuda : test_integrator.o
$(LD) $(LDFLAGS) $^ -o $@ -L $(SAPPOROPATH) -l$(SAPLIB2) $(LDFLAGS)
$(CXX) $(LDFLAGS) $^ -o $@ -L $(SAPPOROPATH) -l$(SAPLIBG6) $(LDFLAGS)


%.o: $(SRCPATH)/%.cpp
$(CXX) $(CXXFLAGS) -c $< -o $@


clean:
/bin/rm -rf *.o *.ptx *.a $(PROG)
/bin/rm -rf *.o *.ptx *.a $(PROG) CUDA


$(OBJ): $(SAPPOROPATH)/$(SAPLIB)
Expand Down
29 changes: 13 additions & 16 deletions testCodes/Makefile_ocl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,18 @@
CXX = g++
CC = gcc
LD = g++
F90 = ifort
CXX ?= g++

.SUFFIXES: .o .cpp .ptx .cu

SAPPOROPATH=../lib/
SAPLIB2 = sapporo_ocl
SAPLIB = lib$(SAPLIB2).a

CUDA_TK = /usr/local/cuda
CUDA_TK ?= /usr/local/cuda
#CUDA_TK = /opt/AMDAPP/

OFLAGS = -g -O3 -Wall -Wextra -Wstrict-aliasing=2 -fopenmp
CXXFLAGS = -fPIC $(OFLAGS) -D_OCL_
OFLAGS = -g -O3 -Wall -Wextra -Wstrict-aliasing=2 -fopenmp
CXXFLAGS += -fPIC -fopenmp $(OFLAGS) -D_OCL_

LDFLAGS = -lOpenCL -fopenmp
LDFLAGS += -lOpenCL -fopenmp

INCLUDEPATH = $(SAPPOROPATH)/include
CXXFLAGS += -I$(INCLUDEPATH) -I./ -I $(SAPPOROPATH) -I$(CUDA_TK)/include
Expand All @@ -33,28 +30,28 @@ kernels:
ln -s $(SAPPOROPATH)/OpenCLKernels OpenCL

test_gravity_block_ocl : test_gravity_block_ocl.o
$(LD) $(LDFLAGS) $^ -o $@ -L $(SAPPOROPATH) -l$(SAPLIB2) $(LDFLAGS)
$(CXX) $(LDFLAGS) $^ -o $@ -L $(SAPPOROPATH) -l$(SAPLIB2) $(LDFLAGS)

test_gravity_block_g5_ocl: test_gravity_block_g5_ocl.o
$(LD) $(LDFLAGS) $^ -o $@ -L $(SAPPOROPATH) -l$(SAPLIB2) $(LDFLAGS)
$(CXX) $(LDFLAGS) $^ -o $@ -L $(SAPPOROPATH) -l$(SAPLIB2) $(LDFLAGS)

test_gravity_block_6th_ocl : test_gravity_block_6th_ocl.o
$(LD) $(LDFLAGS) $^ -o $@ -L $(SAPPOROPATH) -l$(SAPLIB2) $(LDFLAGS)
$(CXX) $(LDFLAGS) $^ -o $@ -L $(SAPPOROPATH) -l$(SAPLIB2) $(LDFLAGS)

test_performance_rangeN_ocl : test_performance_rangeN_ocl.o
$(LD) $(LDFLAGS) $^ -o $@ -L $(SAPPOROPATH) -l$(SAPLIB2) $(LDFLAGS)
$(CXX) $(LDFLAGS) $^ -o $@ -L $(SAPPOROPATH) -l$(SAPLIB2) $(LDFLAGS)

test_performance_blockStep_ocl : test_performance_blockStep_ocl.o
$(LD) $(LDFLAGS) $^ -o $@ -L $(SAPPOROPATH) -l$(SAPLIB2) $(LDFLAGS)
$(CXX) $(LDFLAGS) $^ -o $@ -L $(SAPPOROPATH) -l$(SAPLIB2) $(LDFLAGS)

test_performance_rangeN_6th_ocl : test_performance_rangeN_6th_ocl.o
$(LD) $(LDFLAGS) $^ -o $@ -L $(SAPPOROPATH) -l$(SAPLIB2) $(LDFLAGS)
$(CXX) $(LDFLAGS) $^ -o $@ -L $(SAPPOROPATH) -l$(SAPLIB2) $(LDFLAGS)

test_performance_rangeN_g5_ocl : test_performance_rangeN_g5_ocl.o
$(LD) $(LDFLAGS) $^ -o $@ -L $(SAPPOROPATH) -l$(SAPLIB2) $(LDFLAGS)
$(CXX) $(LDFLAGS) $^ -o $@ -L $(SAPPOROPATH) -l$(SAPLIB2) $(LDFLAGS)

test_integrator_ocl : test_integrator_ocl.o
$(LD) $(LDFLAGS) $^ -o $@ -L $(SAPPOROPATH) -l$(SAPLIB2) $(LDFLAGS)
$(CXX) $(LDFLAGS) $^ -o $@ -L $(SAPPOROPATH) -l$(SAPLIB2) $(LDFLAGS)

%_ocl.o: $(SRCPATH)/%.cpp
$(CXX) $(CXXFLAGS) -c $< -o $@
Expand Down