From cb44fde11f4eade88db41e4547c0e3512b130bb0 Mon Sep 17 00:00:00 2001 From: lkotipal Date: Tue, 30 Jan 2024 14:17:02 +0200 Subject: [PATCH 1/6] Move submodule include paths to main makefile. --- MAKE/Makefile.Freezer | 3 --- MAKE/Makefile.arriesgado | 4 ---- MAKE/Makefile.bsc_jetsontx | 4 ---- MAKE/Makefile.carrington_gcc_openmpi | 4 ---- MAKE/Makefile.cubbli20 | 4 ---- MAKE/Makefile.docker | 3 --- MAKE/Makefile.github_actions | 4 ---- MAKE/Makefile.hawk_gcc_mpt | 4 ---- MAKE/Makefile.hawk_gcc_openmpi | 7 ------- MAKE/Makefile.hawk_intel_mpt | 7 ------- MAKE/Makefile.hawk_intel_openmpi | 7 ------- MAKE/Makefile.home | 4 ---- MAKE/Makefile.horakons | 4 ---- MAKE/Makefile.kstppd | 4 ---- MAKE/Makefile.lumi_cpeGnu | 3 --- MAKE/Makefile.lumi_cray | 4 ---- MAKE/Makefile.lumi_gnu | 4 ---- MAKE/Makefile.lumi_gnu358 | 4 ---- MAKE/Makefile.mahti_gcc | 3 --- MAKE/Makefile.marconi | 5 ----- MAKE/Makefile.perlmutter_gcc | 4 ---- MAKE/Makefile.puhti_gcc | 7 ------- MAKE/Makefile.puhti_intel | 7 ------- MAKE/Makefile.puhti_pgi | 6 ------ MAKE/Makefile.ukko_gcc_openmpi | 3 --- MAKE/Makefile.vorna_gcc | 6 ------ MAKE/Makefile.yann | 4 ---- Makefile | 5 +++++ 28 files changed, 5 insertions(+), 123 deletions(-) diff --git a/MAKE/Makefile.Freezer b/MAKE/Makefile.Freezer index 5cdc5ffa3..3866c8c6a 100644 --- a/MAKE/Makefile.Freezer +++ b/MAKE/Makefile.Freezer @@ -75,9 +75,6 @@ INC_PROFILE = -I$(LIBRARY_PREFIX)/phiprof/include INC_EIGEN = -isystem $(LIBRARY_PREFIX)/eigen #INC_EIGEN = -I$(LIBRARY_PREFIX)/eigen-eigen-07105f7124f9 -#INC_DCCRG = -I$(LIBRARY_PREFIX)/dccrg_new_neighbours -INC_DCCRG = -I./submodules/dccrg -INC_FSGRID = -I./submodules/fsgrid diff --git a/MAKE/Makefile.arriesgado b/MAKE/Makefile.arriesgado index 96a0dda42..d9b7712c3 100644 --- a/MAKE/Makefile.arriesgado +++ b/MAKE/Makefile.arriesgado @@ -48,10 +48,6 @@ LIB_ZOLTAN = -L${LIBRARY_PREFIX}/lib -lzoltan INC_VLSV = -I$(LIBRARY_PREFIX)/vlsv LIB_VLSV = -L$(LIBRARY_PREFIX)/vlsv -lvlsv -INC_DCCRG = -I./submodules/dccrg - -INC_FSGRID = -I./submodules/fsgrid - LIB_PROFILE = -L${LIBRARY_PREFIX}/phiprof/lib -lphiprof -Wl,-rpath=${LIBRARY_PREFIX}/lib INC_PROFILE = -I${LIBRARY_PREFIX}/phiprof/include INC_TOPO = diff --git a/MAKE/Makefile.bsc_jetsontx b/MAKE/Makefile.bsc_jetsontx index 6cdc85d3a..588cd9f02 100644 --- a/MAKE/Makefile.bsc_jetsontx +++ b/MAKE/Makefile.bsc_jetsontx @@ -51,10 +51,6 @@ LIB_ZOLTAN = -L${LIBRARY_PREFIX}/lib -lzoltan INC_VLSV = -I$(LIBRARY_PREFIX)/vlsv LIB_VLSV = -L$(LIBRARY_PREFIX)/vlsv -lvlsv -INC_DCCRG = -I./submodules/dccrg - -INC_FSGRID = -I./submodules/fsgrid - LIB_PROFILE = -L${LIBRARY_PREFIX}/phiprof/lib -lphiprof -Wl,-rpath=${LIBRARY_PREFIX}/phiprof/lib INC_PROFILE = -I${LIBRARY_PREFIX}/phiprof/include INC_TOPO = diff --git a/MAKE/Makefile.carrington_gcc_openmpi b/MAKE/Makefile.carrington_gcc_openmpi index fbb7667db..c06d8830f 100644 --- a/MAKE/Makefile.carrington_gcc_openmpi +++ b/MAKE/Makefile.carrington_gcc_openmpi @@ -113,7 +113,3 @@ LIB_PAPI = -lpapi #header libraries INC_EIGEN = -isystem $(LIBRARY_PREFIX)/ -isystem $(LIBRARY_PREFIX)/Eigen/ -INC_FSGRID = -I./submodules/fsgrid/ -INC_DCCRG = -I./submodules/dccrg/ -INC_VECTORCLASS = -I ./submodules/vectorclass/ -I ./submodules/vectorclass-addon/vector3d/ - diff --git a/MAKE/Makefile.cubbli20 b/MAKE/Makefile.cubbli20 index e8b74bb77..0c5e19a9f 100644 --- a/MAKE/Makefile.cubbli20 +++ b/MAKE/Makefile.cubbli20 @@ -97,10 +97,6 @@ LIB_ZOLTAN = -L$(LIBRARY_PREFIX)/Zoltan/build/lib -lzoltan INC_VLSV = -I$(LIBRARY_PREFIX)/vlsv LIB_VLSV = -L$(LIBRARY_PREFIX)/vlsv -lvlsv -INC_DCCRG = -I./submodules/dccrg - -INC_FSGRID = -I./submodules/fsgrid - INC_PROFILE = -I$(LIBRARY_PREFIX)/phiprof/include LIB_PROFILE = -L$(LIBRARY_PREFIX)/phiprof/lib -lphiprof -Wl,-rpath=$(LIBRARY_PREFIX)/phiprof/lib diff --git a/MAKE/Makefile.docker b/MAKE/Makefile.docker index b4a12831c..a7c46a018 100644 --- a/MAKE/Makefile.docker +++ b/MAKE/Makefile.docker @@ -88,6 +88,3 @@ LIB_PAPI = -L$(LIBRARY_PREFIX)/papi/lib -lpapi #header libraries INC_EIGEN = -I/usr/include/eigen3 -INC_DCCRG = -I./submodules/dccrg -INC_VECTORCLASS = -I ./submodules/vectorclass/ -I ./submodules/vectorclass-addon/vector3d/ -INC_FSGRID = -I./submodules/fsgrid diff --git a/MAKE/Makefile.github_actions b/MAKE/Makefile.github_actions index e73affa8d..2c1759962 100644 --- a/MAKE/Makefile.github_actions +++ b/MAKE/Makefile.github_actions @@ -76,10 +76,6 @@ LIB_SILO = -lsiloh5 INC_PAPI = LIB_PAPI = -lpapi -INC_DCCRG = -I./submodules/dccrg - -INC_FSGRID = -I./submodules/fsgrid - LIB_PROFILE = -I $(LIBRARY_PREFIX)/include ${GITHUB_WORKSPACE}/libraries/lib/libphiprof.a INC_PROFILE = INC_TOPO = diff --git a/MAKE/Makefile.hawk_gcc_mpt b/MAKE/Makefile.hawk_gcc_mpt index 6f95ff982..73af2ce5f 100644 --- a/MAKE/Makefile.hawk_gcc_mpt +++ b/MAKE/Makefile.hawk_gcc_mpt @@ -101,7 +101,3 @@ LIB_PAPI = -L/opt/hlrs/spack/rev-004_2020-06-17/papi/c048e224f-gcc-9.2.0-hxfnx7k #header libraries INC_EIGEN = -I$(LIBRARY_PREFIX)/ -INC_DCCRG = -I./submodules/dccrg -INC_FSGRID = -I./submodules/fsgrid -INC_VECTORCLASS = -I ./submodules/vectorclass/ -I ./submodules/vectorclass-addon/vector3d/ - diff --git a/MAKE/Makefile.hawk_gcc_openmpi b/MAKE/Makefile.hawk_gcc_openmpi index f859aa156..9f698ca39 100644 --- a/MAKE/Makefile.hawk_gcc_openmpi +++ b/MAKE/Makefile.hawk_gcc_openmpi @@ -83,10 +83,3 @@ LIB_PAPI = -L/opt/hlrs/spack/rev-004_2020-06-17/papi/c048e224f-gcc-9.2.0-hxfnx7k #header libraries INC_EIGEN = -I$(LIBRARY_PREFIX)/ -INC_DCCRG = -I./submodules/dccrg -INC_FSGRID = -I./submodules/fsgrid -INC_VECTORCLASS = -I ./submodules/vectorclass/ -I ./submodules/vectorclass-addon/vector3d/ - - - - diff --git a/MAKE/Makefile.hawk_intel_mpt b/MAKE/Makefile.hawk_intel_mpt index f6dea4821..0787820f5 100644 --- a/MAKE/Makefile.hawk_intel_mpt +++ b/MAKE/Makefile.hawk_intel_mpt @@ -84,10 +84,3 @@ LIB_PAPI = -L/opt/hlrs/spack/rev-004_2020-06-17/papi/c048e224f-intel-19.1.0-wlgb #header libraries INC_EIGEN = -I$(LIBRARY_PREFIX)/ -INC_DCCRG = -I./submodules/dccrg -INC_FSGRID = -I./submodules/fsgrid -INC_VECTORCLASS = -I ./submodules/vectorclass/ -I ./submodules/vectorclass-addon/vector3d/ - - - - diff --git a/MAKE/Makefile.hawk_intel_openmpi b/MAKE/Makefile.hawk_intel_openmpi index ef65a88b0..62b81964d 100644 --- a/MAKE/Makefile.hawk_intel_openmpi +++ b/MAKE/Makefile.hawk_intel_openmpi @@ -84,10 +84,3 @@ LIB_PAPI = -L/opt/hlrs/spack/rev-004_2020-06-17/papi/c048e224f-intel-19.1.0-wlgb #header libraries INC_EIGEN = -I$(LIBRARY_PREFIX)/ -INC_DCCRG = -I./submodules/dccrg -INC_FSGRID = -I./submodules/fsgrid -INC_VECTORCLASS = -I ./submodules/vectorclass/ -I ./submodules/vectorclass-addon/vector3d/ - - - - diff --git a/MAKE/Makefile.home b/MAKE/Makefile.home index ee505f66e..f4eed15a0 100644 --- a/MAKE/Makefile.home +++ b/MAKE/Makefile.home @@ -27,10 +27,6 @@ LIB_VLSV = -lvlsv INC_SILO = -I${HOME}/include LIB_SILO = -L${HOME}/lib -lsilo -INC_DCCRG = -I./submodules/dccrg - -INC_FSGRID = -I./submodules/fsgrid - LIB_PROFILE = -L${HOME}/phiprof/lib -lphiprof INC_PROFILE = -I${HOME}/phiprof/include INC_TOPO = diff --git a/MAKE/Makefile.horakons b/MAKE/Makefile.horakons index b8cfa3286..b8e889762 100644 --- a/MAKE/Makefile.horakons +++ b/MAKE/Makefile.horakons @@ -73,10 +73,6 @@ LIB_VLSV = -L$(LIBRARY_PREFIX)/vlsv -lvlsv INC_SILO = -I$(LIBRARY_PREFIX)/include LIB_SILO = -L$(LIBRARY_PREFIX)/lib -lsilo -INC_DCCRG = -I./submodules/dccrg - -INC_FSGRID = -I./submodules/fsgrid - INC_PAPI = -I$(LIBRARY_PREFIX)/papi_install/include/ LIB_PAPI = -L$(LIBRARY_PREFIX)/papi_install/lib/ -lpapi diff --git a/MAKE/Makefile.kstppd b/MAKE/Makefile.kstppd index 02ac35f61..90ab0988c 100644 --- a/MAKE/Makefile.kstppd +++ b/MAKE/Makefile.kstppd @@ -73,10 +73,6 @@ LIB_VLSV = -L$(LIBRARY_PREFIX)/vlsv -lvlsv INC_SILO = -I$(LIBRARY_PREFIX)/include LIB_SILO = -L$(LIBRARY_PREFIX)/lib -lsilo -INC_DCCRG = -I./submodules/dccrg - -INC_FSGRID = -I./submodules/fsgrid - INC_PAPI = -I$(LIBRARY_PREFIX)/papi-5.4.3/src LIB_PAPI = -L$(LIBRARY_PREFIX)/papi-5.4.3/src -lpapi diff --git a/MAKE/Makefile.lumi_cpeGnu b/MAKE/Makefile.lumi_cpeGnu index 52d7ab766..db790e667 100644 --- a/MAKE/Makefile.lumi_cpeGnu +++ b/MAKE/Makefile.lumi_cpeGnu @@ -86,7 +86,4 @@ LIB_PROFILE = -L$(LIBRARY_PREFIX)/phiprof/lib -lphiprof -lgfortran -Wl,-rpath=$( INC_PROFILE = -I$(LIBRARY_PREFIX)/phiprof/include #header libraries -INC_FSGRID = -I./submodules/fsgrid INC_EIGEN = -isystem $(LIBRARY_PREFIX_HEADERS)/eigen/ -INC_DCCRG = -I./submodules/dccrg -INC_VECTORCLASS = -I ./submodules/vectorclass/ -I ./submodules/vectorclass-addon/vector3d/ diff --git a/MAKE/Makefile.lumi_cray b/MAKE/Makefile.lumi_cray index b18b975a4..2f44b9825 100644 --- a/MAKE/Makefile.lumi_cray +++ b/MAKE/Makefile.lumi_cray @@ -81,7 +81,3 @@ INC_PROFILE = -I$(LIBRARY_PREFIX)/phiprof/include #header libraries - -INC_FSGRID = -I./submodules/fsgrid -INC_DCCRG = -I./submodules/dccrg -INC_VECTORCLASS = -I ./submodules/vectorclass/ -I ./submodules/vectorclass-addon/vector3d/ diff --git a/MAKE/Makefile.lumi_gnu b/MAKE/Makefile.lumi_gnu index 1fc1eab29..4b1cd7b2c 100644 --- a/MAKE/Makefile.lumi_gnu +++ b/MAKE/Makefile.lumi_gnu @@ -80,7 +80,3 @@ INC_PROFILE = -I$(LIBRARY_PREFIX)/phiprof/include #header libraries - -INC_FSGRID = -I./submodules/fsgrid -INC_DCCRG = -I./submodules/dccrg -INC_VECTORCLASS = -I ./submodules/vectorclass/ -I ./submodules/vectorclass-addon/vector3d/ diff --git a/MAKE/Makefile.lumi_gnu358 b/MAKE/Makefile.lumi_gnu358 index e9f8a9cb5..2bb4147f3 100644 --- a/MAKE/Makefile.lumi_gnu358 +++ b/MAKE/Makefile.lumi_gnu358 @@ -80,7 +80,3 @@ INC_PROFILE = -I$(LIBRARY_PREFIX)/phiprof/include #header libraries - -INC_FSGRID = -I./submodules/fsgrid/ -INC_DCCRG = -I./submodules/dccrg/ -INC_VECTORCLASS = -I ./submodules/vectorclass/ -I ./submodules/vectorclass-addon/vector3d/ diff --git a/MAKE/Makefile.mahti_gcc b/MAKE/Makefile.mahti_gcc index 876a5b887..06e9035bb 100644 --- a/MAKE/Makefile.mahti_gcc +++ b/MAKE/Makefile.mahti_gcc @@ -85,7 +85,4 @@ LIB_PROFILE = -L$(LIBRARY_PREFIX)/phiprof/lib -lphiprof -Wl,-rpath=$(LIBRARY_PRE INC_PROFILE = -I$(LIBRARY_PREFIX)/phiprof/include # header libraries -INC_FSGRID = -I./submodules/fsgrid INC_EIGEN = -I$(LIBRARY_PREFIX)/../libraries/eigen/ -INC_DCCRG = -I./submodules/dccrg -INC_VECTORCLASS = -I ./submodules/vectorclass/ -I ./submodules/vectorclass-addon/vector3d/ diff --git a/MAKE/Makefile.marconi b/MAKE/Makefile.marconi index 719e48601..aa1f6d047 100644 --- a/MAKE/Makefile.marconi +++ b/MAKE/Makefile.marconi @@ -86,9 +86,4 @@ LIB_PAPI = -L$(LIBRARY_PREFIX)/papi/lib -lpapi -lpfm #header libraries -INC_FSGRID = -I./submodules/fsgrid INC_EIGEN = -I$(HEADER_LIBRARY_PREFIX)/eigen -INC_DCCRG = -I./submodules/dccrg -INC_VECTORCLASS = -I ./submodules/vectorclass/ -I ./submodules/vectorclass-addon/vector3d/ - - diff --git a/MAKE/Makefile.perlmutter_gcc b/MAKE/Makefile.perlmutter_gcc index 7e9b16e73..e9b73d921 100644 --- a/MAKE/Makefile.perlmutter_gcc +++ b/MAKE/Makefile.perlmutter_gcc @@ -82,7 +82,3 @@ INC_PROFILE = -I$(LIBRARY_PREFIX)/phiprof/include #header libraries - -INC_FSGRID = -I./submodules/fsgrid -INC_DCCRG = -I./submodules/dccrg -INC_VECTORCLASS = -I ./submodules/vectorclass/ -I ./submodules/vectorclass-addon/vector3d/ diff --git a/MAKE/Makefile.puhti_gcc b/MAKE/Makefile.puhti_gcc index 3c0dde2b1..d0e50e16d 100644 --- a/MAKE/Makefile.puhti_gcc +++ b/MAKE/Makefile.puhti_gcc @@ -85,11 +85,4 @@ INC_PAPI = -I$(LIBRARY_PREFIX)/hpcx-mpi/$(MPT_VERSION)/$(CC_BRAND)/$(CC_BRAND_VE #header libraries -INC_FSGRID = -I./submodules/fsgrid INC_EIGEN = -I$(LIBRARY_PREFIX)/eigen/3.3.7/ -INC_DCCRG = -I./submodules/dccrg -INC_VECTORCLASS = -I ./submodules/vectorclass/ -I ./submodules/vectorclass-addon/vector3d/ - - - - diff --git a/MAKE/Makefile.puhti_intel b/MAKE/Makefile.puhti_intel index 7542dc511..a8e3ad701 100644 --- a/MAKE/Makefile.puhti_intel +++ b/MAKE/Makefile.puhti_intel @@ -89,11 +89,4 @@ INC_PAPI = -I$(LIBRARY_PREFIX)/hpcx-mpi/$(MPT_VERSION)/$(CC_BRAND)/$(CC_BRAND_VE #header libraries -INC_FSGRID = -I./submodules/fsgrid INC_EIGEN = -I$(LIBRARY_PREFIX)/eigen/3.3.7/ -INC_DCCRG = -I./submodules/dccrg -INC_VECTORCLASS = -I ./submodules/vectorclass/ -I ./submodules/vectorclass-addon/vector3d/ - - - - diff --git a/MAKE/Makefile.puhti_pgi b/MAKE/Makefile.puhti_pgi index 6d59d6ceb..a74baf6b8 100644 --- a/MAKE/Makefile.puhti_pgi +++ b/MAKE/Makefile.puhti_pgi @@ -88,11 +88,5 @@ INC_PROFILE = -I$(LIBRARY_PREFIX)/openmpi/$(MPT_VERSION)/$(CC_BRAND)/$(CC_BRAND_ #header libraries -INC_FSGRID = -I./submodules/fsgrid INC_EIGEN = -I$(LIBRARY_PREFIX)/eigen/3.3.7/ -INC_DCCRG = -I./submodules/dccrg -INC_VECTORCLASS = -I ./submodules/vectorclass/ -I ./submodules/vectorclass-addon/vector3d/ - - - diff --git a/MAKE/Makefile.ukko_gcc_openmpi b/MAKE/Makefile.ukko_gcc_openmpi index 6c561001f..fcacf46ee 100644 --- a/MAKE/Makefile.ukko_gcc_openmpi +++ b/MAKE/Makefile.ukko_gcc_openmpi @@ -113,6 +113,3 @@ LIB_PAPI = -lpapi #header libraries INC_EIGEN = -I$(LIBRARY_PREFIX)/ -I$(LIBRARY_PREFIX)/Eigen/ -INC_FSGRID = -I./submodules/fsgrid -INC_DCCRG = -I./submodules/dccrg -INC_VECTORCLASS = -I ./submodules/vectorclass/ -I ./submodules/vectorclass-addon/vector3d/ diff --git a/MAKE/Makefile.vorna_gcc b/MAKE/Makefile.vorna_gcc index ed8a5d821..0a22c0482 100644 --- a/MAKE/Makefile.vorna_gcc +++ b/MAKE/Makefile.vorna_gcc @@ -91,10 +91,4 @@ LIB_PAPI = -L$(LIBRARY_PREFIX)/$(CC_BRAND)/$(CC_BRAND_VERSION)/$(MPT_BRAND)/$(MP INC_PAPI = -isystem $(LIBRARY_PREFIX)/$(CC_BRAND)/$(CC_BRAND_VERSION)/$(MPT_BRAND)/$(MPT_VERSION)/vorna/papi/include #header libraries -INC_FSGRID = -I./submodules/fsgrid -INC_DCCRG = -I./submodules/dccrg -INC_VECTORCLASS = -I ./submodules/vectorclass/ -I ./submodules/vectorclass-addon/vector3d/ INC_EIGEN = -isystem $(LIBRARY_PREFIX)/ -I$(LIBRARY_PREFIX)/Eigen - - - diff --git a/MAKE/Makefile.yann b/MAKE/Makefile.yann index 68c1d0a05..35e79b012 100644 --- a/MAKE/Makefile.yann +++ b/MAKE/Makefile.yann @@ -52,10 +52,6 @@ LIB_ZOLTAN = -L$(LIBRARY_PREFIX)/zoltan/lib -lzoltan INC_VLSV = -I$(LIBRARY_PREFIX)/vlsv LIB_VLSV = -L$(LIBRARY_PREFIX)/vlsv -lvlsv -INC_DCCRG = -I./submodules/dccrg - -INC_FSGRID = -I./submodules/fsgrid - INC_JEMALLOC = -I$(LIBRARY_PREFIX)/jemalloc/include LIB_JEMALLOC = -L$(LIBRARY_PREFIX)/jemalloc/lib -ljemalloc diff --git a/Makefile b/Makefile index b92d8e63c..317ffd762 100644 --- a/Makefile +++ b/Makefile @@ -21,6 +21,11 @@ ifneq (,$(findstring testpackage,$(MAKECMDGOALS))) COMPFLAGS += -DIONOSPHERE_SORTED_SUMS -DINITIALIZE_ALIGNED_MALLOC_WITH_NAN endif +# Use submodules by default +# This can be overridden in architecture-specific makefiles +INC_FSGRID = -I./submodules/fsgrid/ +INC_DCCRG = -I./submodules/dccrg/ +INC_VECTORCLASS = -I ./submodules/vectorclass/ -I ./submodules/vectorclass-addon/vector3d/ include MAKE/Makefile.${ARCH} From e4df5a76f76e7731a54d0e60a950acf31936858a Mon Sep 17 00:00:00 2001 From: lkotipal Date: Wed, 31 Jan 2024 12:37:43 +0200 Subject: [PATCH 2/6] Remove more superfluous include paths --- MAKE/Makefile.Freezer | 2 -- MAKE/Makefile.cubbli20 | 2 -- MAKE/Makefile.github_actions | 2 -- MAKE/Makefile.hawk_gcc_mpt | 2 -- MAKE/Makefile.horakons | 2 -- MAKE/Makefile.yann | 2 -- 6 files changed, 12 deletions(-) diff --git a/MAKE/Makefile.Freezer b/MAKE/Makefile.Freezer index 3866c8c6a..132163509 100644 --- a/MAKE/Makefile.Freezer +++ b/MAKE/Makefile.Freezer @@ -13,13 +13,11 @@ LNK = mpic++ ifeq ($(DISTRIBUTION_FP_PRECISION),SPF) #Single-precision VECTORCLASS = VEC8F_AGNER - INC_VECTORCLASS = -I ./submodules/vectorclass/ -I ./submodules/vectorclass-addon/vector3d/ # VECTORCLASS = VEC8F_FALLBACK # INC_VECTORCLASS = -I$(LIBRARY_PREFIX)/../vlasiator/vlasovsolver else #Double-precision VECTORCLASS = VEC4D_AGNER - INC_VECTORCLASS = -I ./submodules/vectorclass/ -I ./submodules/vectorclass-addon/vector3d/ # VECTORCLASS = VEC4D_FALLBACK # INC_VECTORCLASS = -I$(LIBRARY_PREFIX)/../vlasiator/vlasovsolver endif diff --git a/MAKE/Makefile.cubbli20 b/MAKE/Makefile.cubbli20 index 0c5e19a9f..8b9041023 100644 --- a/MAKE/Makefile.cubbli20 +++ b/MAKE/Makefile.cubbli20 @@ -53,11 +53,9 @@ LIB_JEMALLOC = #-L$(LIBRARY_PREFIX)/lib -ljemalloc ifeq ($(DISTRIBUTION_FP_PRECISION),SPF) #Single-precision - INC_VECTORCLASS = -I ./submodules/vectorclass/ -I ./submodules/vectorclass-addon/vector3d/ VECTORCLASS = VEC4F_FALLBACK else #Double-precision - INC_VECTORCLASS = -I ./submodules/vectorclass/ -I ./submodules/vectorclass-addon/vector3d/ VECTORCLASS = VEC4D_FALLBACK endif diff --git a/MAKE/Makefile.github_actions b/MAKE/Makefile.github_actions index 2c1759962..246be2aa8 100644 --- a/MAKE/Makefile.github_actions +++ b/MAKE/Makefile.github_actions @@ -79,5 +79,3 @@ LIB_PAPI = -lpapi LIB_PROFILE = -I $(LIBRARY_PREFIX)/include ${GITHUB_WORKSPACE}/libraries/lib/libphiprof.a INC_PROFILE = INC_TOPO = - -INC_VECTORCLASS = -I ./submodules/vectorclass/ -I ./submodules/vectorclass-addon/vector3d/ diff --git a/MAKE/Makefile.hawk_gcc_mpt b/MAKE/Makefile.hawk_gcc_mpt index 73af2ce5f..46335133c 100644 --- a/MAKE/Makefile.hawk_gcc_mpt +++ b/MAKE/Makefile.hawk_gcc_mpt @@ -22,13 +22,11 @@ LNK = mpicxx ifeq ($(DISTRIBUTION_FP_PRECISION),SPF) #Single-precision VECTORCLASS = VEC8F_AGNER - INC_VECTORCLASS = -I ./submodules/vectorclass/ -I ./submodules/vectorclass-addon/vector3d/ # VECTORCLASS = VEC8F_FALLBACK # INC_VECTORCLASS = -I$(HOME)/vlasiator/vlasovsolver else #Double-precision VECTORCLASS = VEC4D_AGNER - INC_VECTORCLASS = -I ./submodules/vectorclass/ -I ./submodules/vectorclass-addon/vector3d/ # VECTORCLASS = VEC4D_FALLBACK # VECTORCLASS = VEC8D_FALLBACK # INC_VECTORCLASS = -I$(HOME)/vlasiator/vlasovsolver diff --git a/MAKE/Makefile.horakons b/MAKE/Makefile.horakons index b8e889762..231d88dcf 100644 --- a/MAKE/Makefile.horakons +++ b/MAKE/Makefile.horakons @@ -59,8 +59,6 @@ PAPI_FLAG = LIBRARY_PREFIX = /home/horakons/vlasiator_libs/ -INC_VECTORCLASS = -I ./submodules/vectorclass/ -I ./submodules/vectorclass-addon/vector3d/ - INC_BOOST = -I/usr/include/boost/ LIB_BOOST = -L/usr/lib/x86_64-linux-gnu/ -lboost_program_options diff --git a/MAKE/Makefile.yann b/MAKE/Makefile.yann index 35e79b012..c669d44bb 100644 --- a/MAKE/Makefile.yann +++ b/MAKE/Makefile.yann @@ -10,11 +10,9 @@ ifeq ($(DISTRIBUTION_FP_PRECISION),SPF) #Single-precision - INC_VECTORCLASS = -I ./submodules/vectorclass/ -I ./submodules/vectorclass-addon/vector3d/ VECTORCLASS = VEC4F_FALLBACK else #Double-precision - INC_VECTORCLASS = -I ./submodules/vectorclass/ -I ./submodules/vectorclass-addon/vector3d/ VECTORCLASS = VEC4D_FALLBACK endif From 2d6c41978d27509554bfa7927250bc974afbebdf Mon Sep 17 00:00:00 2001 From: lkotipal Date: Mon, 22 Apr 2024 13:48:29 +0300 Subject: [PATCH 3/6] dummy From 0152219bec03de2de5b0a2aca9165847e01f20cd Mon Sep 17 00:00:00 2001 From: Yann Pfau-Kempf Date: Thu, 22 Aug 2024 15:45:13 +0300 Subject: [PATCH 4/6] Update Makefile Forgot to move the eigen submodule INC to the main Makefile --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index c2c75ec87..cfdb92645 100644 --- a/Makefile +++ b/Makefile @@ -26,6 +26,7 @@ endif INC_FSGRID = -I./submodules/fsgrid/ INC_DCCRG = -I./submodules/dccrg/ INC_VECTORCLASS = -I ./submodules/vectorclass/ -I ./submodules/vectorclass-addon/vector3d/ +INC_EIGEN = -I ./submodules/eigen/ include MAKE/Makefile.${ARCH} From 79c6fb70b6d88c73078951a3110021c36e35ec87 Mon Sep 17 00:00:00 2001 From: Yann Pfau-Kempf Date: Thu, 22 Aug 2024 15:50:45 +0300 Subject: [PATCH 5/6] Update Makefile.github_actions Keep one Makefile with arch-specific INCLUDE paths. --- MAKE/Makefile.github_actions | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/MAKE/Makefile.github_actions b/MAKE/Makefile.github_actions index 80d6f0f55..55205e429 100644 --- a/MAKE/Makefile.github_actions +++ b/MAKE/Makefile.github_actions @@ -80,3 +80,9 @@ LIB_PROFILE = -I $(LIBRARY_PREFIX)/include ${GITHUB_WORKSPACE}/libraries/lib/lib INC_PROFILE = INC_TOPO = +# Works without but as an example: arch-specific INCLUDE paths be like this: +INC_DCCRG = -I${GITHUB_WORKSPACE}/submodules/dccrg +INC_EIGEN = -I${GITHUB_WORKSPACE}/submodules/eigen +INC_FSGRID = -I${GITHUB_WORKSPACE}/submodules/fsgrid +INC_VECTORCLASS = -isystem ${GITHUB_WORKSPACE}/submodules/vectorclass/ -isystem ${GITHUB_WORKSPACE}/submodules/vectorclass-addon/vector3d/ +INC_EIGEN = -isystem ${GITHUB_WORKSPACE}/submodules/eigen/ From d5b7bca219c759fc95f2499a5790a8c6eb2fd8e6 Mon Sep 17 00:00:00 2001 From: Yann Pfau-Kempf Date: Thu, 22 Aug 2024 15:52:01 +0300 Subject: [PATCH 6/6] Update Makefile.github_actions Removed a duplicate include line. Removed a duplicate include line. --- MAKE/Makefile.github_actions | 1 - 1 file changed, 1 deletion(-) diff --git a/MAKE/Makefile.github_actions b/MAKE/Makefile.github_actions index 55205e429..5dd10cf33 100644 --- a/MAKE/Makefile.github_actions +++ b/MAKE/Makefile.github_actions @@ -82,7 +82,6 @@ INC_TOPO = # Works without but as an example: arch-specific INCLUDE paths be like this: INC_DCCRG = -I${GITHUB_WORKSPACE}/submodules/dccrg -INC_EIGEN = -I${GITHUB_WORKSPACE}/submodules/eigen INC_FSGRID = -I${GITHUB_WORKSPACE}/submodules/fsgrid INC_VECTORCLASS = -isystem ${GITHUB_WORKSPACE}/submodules/vectorclass/ -isystem ${GITHUB_WORKSPACE}/submodules/vectorclass-addon/vector3d/ INC_EIGEN = -isystem ${GITHUB_WORKSPACE}/submodules/eigen/