Bausager/Flux
1
0
Fork 0
Code Issues 36 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Finishing up and starting lu decomp

Browse Source
This commit is contained in:
Bausager
2025-09-13 21:44:20 +02:00
parent 320436ce98
commit 88087ea6a6
24 changed files with 1502 additions and 699 deletions
Download Patch File Download Diff File Expand all files Collapse all files
makefile
+62 -5
View File
@@ -10,6 +10,11 @@ SRC_DIR := src
INC_DIR := include
OBJ_DIR := obj
BIN_DIR := bin
TEST_BIN := $(BIN_DIR)/tests
# All test sources
#
@@ -23,13 +28,30 @@ SRCS := $(shell find $(SRC_DIR) -name '*.cpp')
OBJS := $(patsubst $(SRC_DIR)/%.cpp,$(OBJ_DIR)/%.o,$(SRCS))
# === Test sources ===
TEST_SRCS := $(shell find test -name 'test_*.cpp')
TEST_OBJS := $(patsubst test/%.cpp, $(OBJ_DIR)/test/%.o, $(TEST_SRCS))
# The single file that defines TEST_MAIN / main()
TEST_MAIN := $(OBJ_DIR)/test/test_all.o
# === OpenMP runtime configuration (override-able) ===
OMP_PROC_BIND ?= close # close|spread|master
OMP_PLACES ?= cores # cores|threads|sockets
OMP_MAX_LEVELS ?= 1 # 1 = no nested teams; set 2+ to allow nesting
OMP_MAX_LEVELS ?= 2 # 1 = no nested teams; set 2+ to allow nesting
OMP_THREADS ?= 16 # e.g. "16" or "8,4" for nested (outer,inner)
OMP_DYNAMIC ?= true # true/false: let runtime adjust threads
OMP_DISPLAY_ENV ?= FALSE # TRUE to print runtime config at startup
OMP_DYNAMIC ?= TRUE # TRUE/FALSE: let runtime adjust threads
OMP_SCHEDULE ?= STATIC # STATIC recommended for matvec/matmul
OMP_DISPLAY_ENV ?= TRUE # TRUE to print runtime config at startup
# Export OMP defaults so child makes or tools see them (not strictly required)
export OMP_PROC_BIND
export OMP_PLACES
export OMP_MAX_LEVELS
export OMP_THREADS
export OMP_DYNAMIC
export OMP_SCHEDULE
export OMP_DISPLAY_ENV
@@ -49,11 +71,19 @@ $(OBJ_DIR)/%.o: $(SRC_DIR)/%.cpp
# === Run with OpenMP env set only for the run ===
.PHONY: run
run: $(TARGET)
OMP_PROC_BIND=$(OMP_PROC_BIND) \
@echo ">>> OMP_PROC_BIND=$(OMP_PROC_BIND)"
@echo ">>> OMP_PLACES=$(OMP_PLACES)"
@echo ">>> OMP_MAX_ACTIVE_LEVELS=$(OMP_MAX_LEVELS)"
@echo ">>> OMP_NUM_THREADS=$(OMP_THREADS)"
@echo ">>> OMP_DYNAMIC=$(OMP_DYNAMIC)"
@echo ">>> OMP_SCHEDULE=$(OMP_SCHEDULE)"
@echo ">>> OMP_DISPLAY_ENV=$(OMP_DISPLAY_ENV)"
@OMP_PROC_BIND=$(OMP_PROC_BIND) \
OMP_PLACES=$(OMP_PLACES) \
OMP_MAX_ACTIVE_LEVELS=$(OMP_MAX_LEVELS) \
OMP_NUM_THREADS="$(OMP_THREADS)" \
OMP_DYNAMIC=$(OMP_DYNAMIC) \
OMP_SCHEDULE=$(OMP_SCHEDULE) \
OMP_DISPLAY_ENV=$(OMP_DISPLAY_ENV) \
./$(TARGET)
@@ -77,4 +107,31 @@ info:
@echo "Source files: $(SRCS)"
@echo "Object files: $(OBJS)"
@echo "CXXFLAGS: $(CXXFLAGS)"
@echo "LDFLAGS: $(LDFLAGS)"
@echo "LDFLAGS: $(LDFLAGS)"
.PHONY: test
test: $(TEST_BIN)
@echo ">>> OMP_PROC_BIND=$(OMP_PROC_BIND)"
@echo ">>> OMP_PLACES=$(OMP_PLACES)"
@echo ">>> OMP_MAX_ACTIVE_LEVELS=$(OMP_MAX_LEVELS)"
@echo ">>> OMP_NUM_THREADS=$(OMP_THREADS)"
@echo ">>> OMP_DYNAMIC=$(OMP_DYNAMIC)"
@echo ">>> OMP_SCHEDULE=$(OMP_SCHEDULE)"
@echo ">>> OMP_DISPLAY_ENV=$(OMP_DISPLAY_ENV)"
@OMP_PROC_BIND=$(OMP_PROC_BIND) \
OMP_PLACES=$(OMP_PLACES) \
OMP_MAX_ACTIVE_LEVELS=$(OMP_MAX_LEVELS) \
OMP_NUM_THREADS="$(OMP_THREADS)" \
OMP_DYNAMIC=$(OMP_DYNAMIC) \
OMP_SCHEDULE=$(OMP_SCHEDULE) \
OMP_DISPLAY_ENV=$(OMP_DISPLAY_ENV) \
$(TEST_BIN)
$(TEST_BIN): $(TEST_OBJS) $(TEST_MAIN)
@mkdir -p $(BIN_DIR)
$(CXX) $(CXXFLAGS) -o $@ $^ $(LDFLAGS)
$(OBJ_DIR)/test/%.o: test/%.cpp
@mkdir -p $(dir $@)
$(CXX) $(CXXFLAGS) -c $< -o $@