v1 version and measurements

This commit is contained in:
2024-11-20 21:56:04 +02:00
parent 6246c02420
commit 494fdddd04
22 changed files with 974 additions and 201 deletions
+32 -11
View File
@@ -27,8 +27,8 @@ SRC_DIR_LIST := src gtest
# Include directories list(space seperated). Makefile-relative path.
INC_DIR_LIST := inc \
src \
/usr/include/hdf5/serial/ \
gtest \
/usr/include/hdf5/serial/
# Libs/MATLAB/R2019b/include/ \
# Exclude files list(space seperated). Filenames only.
@@ -179,7 +179,7 @@ hpc-clean:
rm hpc-results/post
#
# ================ Local via docker build rules =================
# ================ Local (and/or) via docker build rules =================
#
# examples:
# make IMAGE=hpcimage v0
@@ -190,12 +190,6 @@ local_v0: CXXFLAGS := $(DEB_CXXFLAGS) -DCODE_VERSION=0
local_v0: TARGET := local_v0
local_v0: $(BUILD_DIR)/$(TARGET)
cp $(BUILD_DIR)/$(TARGET) out/$(TARGET)
local_v0_opt: CFLAGS := $(REL_CFLAGS) -DCODE_VERSION=0
local_v0_opt: CXXFLAGS := $(REL_CXXFLAGS) -DCODE_VERSION=0
local_v0_opt: TARGET := local_v0_opt
local_v0_opt: $(BUILD_DIR)/$(TARGET)
cp $(BUILD_DIR)/$(TARGET) out/$(TARGET)
local_v1: CFLAGS := $(DEB_CFLAGS) -DCODE_VERSION=1
local_v1: CXXFLAGS := $(DEB_CXXFLAGS) -DCODE_VERSION=1
@@ -203,6 +197,21 @@ local_v1: TARGET := local_v1
local_v1: $(BUILD_DIR)/$(TARGET)
cp $(BUILD_DIR)/$(TARGET) out/$(TARGET)
local_v1_omp: CFLAGS := $(DEB_CFLAGS) -fopenmp -DCODE_VERSION=1 -DOMP
local_v1_omp: CXXFLAGS := $(DEB_CXXFLAGS) -fopenmp -DCODE_VERSION=1 -DOMP
local_v1_omp: LDFLAGS += -fopenmp
local_v1_omp: TARGET := local_v1_omp
local_v1_omp: $(BUILD_DIR)/$(TARGET)
cp $(BUILD_DIR)/$(TARGET) out/$(TARGET)
local_v1_pth: CFLAGS := $(DEB_CFLAGS) -DCODE_VERSION=1 -DPTHREADS
local_v1_pth: CXXFLAGS := $(DEB_CXXFLAGS) -DCODE_VERSION=1 -DPTHREADS
local_v1_pth: TARGET := local_v1_pth
local_v1_pth: $(BUILD_DIR)/$(TARGET)
cp $(BUILD_DIR)/$(TARGET) out/$(TARGET)
v0: DOCKER := $(DOCKER_CMD)
v0: CFLAGS := $(REL_CFLAGS) -DCODE_VERSION=0
v0: CXXFLAGS := $(REL_CXXFLAGS) -DCODE_VERSION=0
@@ -215,7 +224,7 @@ v1_cilk: CXX := /usr/local/OpenCilk-9.0.1-Linux/bin/clang++
v1_cilk: CFLAGS := $(REL_CFLAGS) -fcilkplus -DCODE_VERSION=1 -DCILK
v1_cilk: CXXFLAGS := $(REL_CXXFLAGS) -fcilkplus -DCODE_VERSION=1 -DCILK
v1_cilk: LDFLAGS += -fcilkplus
v1_cilk: TARGET := knnsearch_cilkv1
v1_cilk: TARGET := knnsearch_v1_cilk
v1_cilk: $(BUILD_DIR)/$(TARGET)
cp $(BUILD_DIR)/$(TARGET) out/$(TARGET)
@@ -223,10 +232,17 @@ v1_omp: DOCKER := $(DOCKER_CMD)
v1_omp: CFLAGS := $(REL_CFLAGS) -fopenmp -DCODE_VERSION=1 -DOMP
v1_omp: CXXFLAGS := $(REL_CXXFLAGS) -fopenmp -DCODE_VERSION=1 -DOMP
v1_omp: LDFLAGS += -fopenmp
v1_omp: TARGET := knnsearch_ompv1
v1_omp: TARGET := knnsearch_v1_omp
v1_omp: $(BUILD_DIR)/$(TARGET)
cp $(BUILD_DIR)/$(TARGET) out/$(TARGET)
v1_pth: DOCKER := $(DOCKER_CMD)
v1_pth: CFLAGS := $(REL_CFLAGS) -DCODE_VERSION=1 -DPTHREADS
v1_pth: CXXFLAGS := $(REL_CXXFLAGS) -DCODE_VERSION=1 -DPTHREADS
v1_pth: TARGET := knnsearch_v1_pth
v1_pth: $(BUILD_DIR)/$(TARGET)
cp $(BUILD_DIR)/$(TARGET) out/$(TARGET)
v1: DOCKER := $(DOCKER_CMD)
v1: CFLAGS := $(REL_CFLAGS) -DCODE_VERSION=1
v1: CXXFLAGS := $(REL_CXXFLAGS) -DCODE_VERSION=1
@@ -240,7 +256,12 @@ tests: TARGET := tests
tests: $(BUILD_DIR)/$(TARGET)
cp $(BUILD_DIR)/$(TARGET) out/$(TARGET)
tests_rel: CFLAGS := $(REL_CFLAGS) -DCODE_VERSION=0 -DTESTING
tests_rel: CXXFLAGS := $(REL_CXXFLAGS) -DCODE_VERSION=0 -DTESTING
tests_rel: TARGET := tests
tests_rel: $(BUILD_DIR)/$(TARGET)
cp $(BUILD_DIR)/$(TARGET) out/$(TARGET)
#
# ========= Inside CSAL Image build rules ===========
#