Skip to content

Commit e2026b0

Browse files
Bugfix. Ensure that "make forward" works.
1 parent bb4fbcc commit e2026b0

2 files changed

Lines changed: 16 additions & 14 deletions

File tree

BLAS/Makefile

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,14 @@ else
6363
BLAS_LIB ?= -lrefblas
6464
endif
6565

66+
# Optional: DIFFSIZES_access.o when using F77 ISIZE globals (run_tapenade_blas.py writes DIFFSIZES_access.f)
67+
# Must be defined before any rule that uses it as a prerequisite, so "make forward" (etc.) builds it first.
68+
ifneq ($(wildcard $(SRC_DIR)/DIFFSIZES_access.f),)
69+
DIFFSIZES_ACCESS_OBJ := $(BUILD_DIR)/DIFFSIZES_access.o
70+
else
71+
DIFFSIZES_ACCESS_OBJ :=
72+
endif
73+
6674
# Unified library targets (one library per mode containing all differentiated code)
6775
# Note: Original BLAS functions come from $(BLAS_LIB) (librefblas in LAPACKDIR)
6876
LIB_D := $(BUILD_DIR)/libdiffblas_d.a
@@ -274,13 +282,6 @@ $(BUILD_DIR)/libdiffblas_d.a: compile-d $(DIFFSIZES_ACCESS_OBJ)
274282
$(BUILD_DIR)/libdiffblas_d.so: compile-d
275283
@$(FC) -shared -o $@ $$(ls $(BUILD_DIR)/*_d.o 2>/dev/null)
276284

277-
# Optional: DIFFSIZES_access.o when using F77 ISIZE globals (run_tapenade_blas.py writes DIFFSIZES_access.f)
278-
ifneq ($(wildcard $(SRC_DIR)/DIFFSIZES_access.f),)
279-
DIFFSIZES_ACCESS_OBJ := $(BUILD_DIR)/DIFFSIZES_access.o
280-
else
281-
DIFFSIZES_ACCESS_OBJ :=
282-
endif
283-
284285
# Single library for all reverse mode differentiated code
285286
$(BUILD_DIR)/libdiffblas_b.a: compile-b $(DIFFSIZES_ACCESS_OBJ)
286287
@ar rcs $@ $$(ls $(BUILD_DIR)/*_b.o 2>/dev/null) $(BUILD_DIR)/adStack.o $(DIFFSIZES_ACCESS_OBJ)

run_tapenade_blas.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8666,6 +8666,14 @@ def generate_top_level_makefile(out_dir, flat_mode=False):
86668666
BLAS_LIB ?= -lrefblas
86678667
endif
86688668

8669+
# Optional: DIFFSIZES_access.o when using F77 ISIZE globals (run_tapenade_blas.py writes DIFFSIZES_access.f)
8670+
# Must be defined before any rule that uses it as a prerequisite, so "make forward" (etc.) builds it first.
8671+
ifneq ($(wildcard $(SRC_DIR)/DIFFSIZES_access.f),)
8672+
DIFFSIZES_ACCESS_OBJ := $(BUILD_DIR)/DIFFSIZES_access.o
8673+
else
8674+
DIFFSIZES_ACCESS_OBJ :=
8675+
endif
8676+
86698677
# Unified library targets (one library per mode containing all differentiated code)
86708678
# Note: Original BLAS functions come from $(BLAS_LIB) (librefblas in LAPACKDIR)
86718679
LIB_D := $(BUILD_DIR)/libdiffblas_d.a
@@ -8877,13 +8885,6 @@ def generate_top_level_makefile(out_dir, flat_mode=False):
88778885
$(BUILD_DIR)/libdiffblas_d.so: compile-d
88788886
@$(FC) -shared -o $@ $$(ls $(BUILD_DIR)/*_d.o 2>/dev/null)
88798887

8880-
# Optional: DIFFSIZES_access.o when using F77 ISIZE globals (run_tapenade_blas.py writes DIFFSIZES_access.f)
8881-
ifneq ($(wildcard $(SRC_DIR)/DIFFSIZES_access.f),)
8882-
DIFFSIZES_ACCESS_OBJ := $(BUILD_DIR)/DIFFSIZES_access.o
8883-
else
8884-
DIFFSIZES_ACCESS_OBJ :=
8885-
endif
8886-
88878888
# Single library for all reverse mode differentiated code
88888889
$(BUILD_DIR)/libdiffblas_b.a: compile-b $(DIFFSIZES_ACCESS_OBJ)
88898890
@ar rcs $@ $$(ls $(BUILD_DIR)/*_b.o 2>/dev/null) $(BUILD_DIR)/adStack.o $(DIFFSIZES_ACCESS_OBJ)

0 commit comments

Comments
 (0)