Merge pull request #895 from lkotipal/move-includepaths

Move submodule include paths
fmihpc · Aug 22, 2024 · c81422d · c81422d
2 parents 0ebc1c3 + d5b7bca
commit c81422d
Show file tree

Hide file tree

Showing 28 changed files with 9 additions and 195 deletions.
diff --git 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
@@ -70,13 +68,3 @@ LIB_VLSV = -L$(LIBRARY_PREFIX)/vlsv -lvlsv -Wl,-rpath=$(LIBRARY_PREFIX)/vlsv/lib
 
 LIB_PROFILE = -L$(LIBRARY_PREFIX)/phiprof/lib -lphiprof -Wl,-rpath=$(LIBRARY_PREFIX)/phiprof/lib
 INC_PROFILE = -I$(LIBRARY_PREFIX)/phiprof/include
-
-#header libraries
-
-INC_EIGEN = -isystem ./submodules/eigen/
-#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
@@ -48,12 +48,5 @@ LIB_ZOLTAN = -L${LIBRARY_PREFIX}/lib -lzoltan
 INC_VLSV = -I$(LIBRARY_PREFIX)/include
 LIB_VLSV = -L$(LIBRARY_PREFIX)/lib -lvlsv
 
-INC_DCCRG = -I./submodules/dccrg
-
-INC_FSGRID = -I./submodules/fsgrid
-
 LIB_PROFILE = -L${LIBRARY_PREFIX}/lib -lphiprof -Wl,-rpath=${LIBRARY_PREFIX}/lib 
 INC_PROFILE = -I${LIBRARY_PREFIX}/include
-INC_TOPO =
-
-INC_EIGEN = -isystem ./submodules/eigen/
diff --git 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
@@ -110,10 +110,3 @@ INC_ZOLTAN = -isystem $(LIBRARY_PREFIX)/$(CC_BRAND)/$(CC_BRAND_VERSION)/$(MPT_BR
 #LIB_PAPI = -L$(LIBRARY_PREFIX)/$(CC_BRAND)/$(CC_BRAND_VERSION)/$(MPT_BRAND)/$(MPT_VERSION)/carrington/papi/lib -lpapi -Wl,-rpath=$(LIBRARY_PREFIX)/$(CC_BRAND)/$(CC_BRAND_VERSION)/$(MPT_BRAND)/$(MPT_VERSION)/carrington/papi/lib
 #INC_PAPI = -isystem $(LIBRARY_PREFIX)/$(CC_BRAND)/$(CC_BRAND_VERSION)/$(MPT_BRAND)/$(MPT_VERSION)/carrington/papi/include
 LIB_PAPI = -lpapi
-
-#header libraries
-INC_EIGEN = -isystem ./submodules/eigen/
-INC_FSGRID = -I./submodules/fsgrid/
-INC_DCCRG = -I./submodules/dccrg/
-INC_VECTORCLASS = -isystem ./submodules/vectorclass/ -isystem ./submodules/vectorclass-addon/vector3d/
-
diff --git 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
 
@@ -97,10 +95,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
@@ -84,10 +84,3 @@ LIB_PROFILE = -L$(LIBRARY_PREFIX)/phiprof-2.0-beta/lib -lphiprof
 
 INC_PAPI = -I$(LIBRARY_PREFIX)/papi/include
 LIB_PAPI = -L$(LIBRARY_PREFIX)/papi/lib -lpapi
-
-#header libraries
-
-INC_EIGEN = -isystem ./submodules/eigen/
-INC_DCCRG = -I./submodules/dccrg
-INC_VECTORCLASS = -isystem ./submodules/vectorclass/ -isystem ./submodules/vectorclass-addon/vector3d/
-INC_FSGRID = -I./submodules/fsgrid
diff --git a/MAKE/Makefile.github_actions b/MAKE/Makefile.github_actions
@@ -76,13 +76,12 @@ LIB_SILO = -lsiloh5
 INC_PAPI =
 LIB_PAPI = -lpapi
 
-INC_DCCRG = -I${GITHUB_WORKSPACE}/submodules/dccrg
-INC_EIGEN = -I${GITHUB_WORKSPACE}/submodules/eigen
-INC_FSGRID = -I${GITHUB_WORKSPACE}/submodules/fsgrid
-
 LIB_PROFILE = -I $(LIBRARY_PREFIX)/include ${GITHUB_WORKSPACE}/libraries/lib/libphiprof.a
 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_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/
diff --git 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
@@ -97,10 +95,3 @@ INC_PROFILE = -I$(LIBRARY_PREFIX)/$(MPI_BRAND)/$(MPI_VERSION)/$(CC_BRAND)/$(CC_B
 
 INC_PAPI = -I/opt/hlrs/spack/rev-004_2020-06-17/papi/c048e224f-gcc-9.2.0-hxfnx7kt/include
 LIB_PAPI = -L/opt/hlrs/spack/rev-004_2020-06-17/papi/c048e224f-gcc-9.2.0-hxfnx7kt/lib -lpapi
-
-#header libraries
-
-INC_DCCRG = -I./submodules/dccrg
-INC_FSGRID = -I./submodules/fsgrid
-INC_VECTORCLASS = -isystem ./submodules/vectorclass/ -isystem ./submodules/vectorclass-addon/vector3d/
-INC_EIGEN = -isystem ./submodules/eigen/
diff --git a/MAKE/Makefile.hawk_gcc_openmpi b/MAKE/Makefile.hawk_gcc_openmpi
@@ -79,13 +79,3 @@ INC_PROFILE = -I$(LIBRARY_PREFIX)/$(MPI_BRAND)/$(MPI_VERSION)/$(CC_BRAND)/$(CC_B
 
 INC_PAPI = -I/opt/hlrs/spack/rev-004_2020-06-17/papi/c048e224f-gcc-9.2.0-hxfnx7kt/include
 LIB_PAPI = -L/opt/hlrs/spack/rev-004_2020-06-17/papi/c048e224f-gcc-9.2.0-hxfnx7kt/lib -lpapi
-
-#header libraries
-
-INC_DCCRG = -I./submodules/dccrg
-INC_FSGRID = -I./submodules/fsgrid
-INC_VECTORCLASS = -isystem ./submodules/vectorclass/ -isystem ./submodules/vectorclass-addon/vector3d/
-INC_EIGEN = -isystem ./submodules/eigen/
-
-
-
diff --git a/MAKE/Makefile.hawk_intel_mpt b/MAKE/Makefile.hawk_intel_mpt
@@ -80,13 +80,3 @@ INC_PROFILE = -I$(LIBRARY_PREFIX)/$(MPI_BRAND)/$(MPI_VERSION)/$(CC_BRAND)/$(CC_B
 
 INC_PAPI = -I/opt/hlrs/spack/rev-004_2020-06-17/papi/c048e224f-intel-19.1.0-wlgbb2mr/include
 LIB_PAPI = -L/opt/hlrs/spack/rev-004_2020-06-17/papi/c048e224f-intel-19.1.0-wlgbb2mr/lib -lpapi
-
-#header libraries
-
-INC_DCCRG = -I./submodules/dccrg
-INC_FSGRID = -I./submodules/fsgrid
-INC_VECTORCLASS = -isystem ./submodules/vectorclass/ -isystem ./submodules/vectorclass-addon/vector3d/
-INC_EIGEN = -isystem ./submodules/eigen/
-
-
-
diff --git a/MAKE/Makefile.hawk_intel_openmpi b/MAKE/Makefile.hawk_intel_openmpi
@@ -80,13 +80,3 @@ INC_PROFILE = -I$(LIBRARY_PREFIX)/$(MPI_BRAND)/$(MPI_VERSION)/$(CC_BRAND)/$(CC_B
 
 INC_PAPI = -I/opt/hlrs/spack/rev-004_2020-06-17/papi/c048e224f-intel-19.1.0-wlgbb2mr/include
 LIB_PAPI = -L/opt/hlrs/spack/rev-004_2020-06-17/papi/c048e224f-intel-19.1.0-wlgbb2mr/lib -lpapi
-
-#header libraries
-
-INC_DCCRG = -I./submodules/dccrg
-INC_FSGRID = -I./submodules/fsgrid
-INC_VECTORCLASS = -isystem ./submodules/vectorclass/ -isystem ./submodules/vectorclass-addon/vector3d/
-INC_EIGEN = -isystem ./submodules/eigen/
-
-
-
diff --git 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
@@ -71,10 +71,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
@@ -71,10 +71,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
@@ -84,9 +84,3 @@ LIB_VLSV = -L$(LIBRARY_PREFIX)/vlsv -lvlsv -Wl,-rpath=$(LIBRARY_PREFIX2)/vlsv
 
 LIB_PROFILE = -L$(LIBRARY_PREFIX)/phiprof/lib -lphiprof -lgfortran -Wl,-rpath=$(LIBRARY_PREFIX)/phiprof/lib
 INC_PROFILE = -I$(LIBRARY_PREFIX)/phiprof/include 
-
-#header libraries
-INC_FSGRID = -I./submodules/fsgrid
-INC_DCCRG = -I./submodules/dccrg
-INC_VECTORCLASS = -isystem ./submodules/vectorclass/ -isystem ./submodules/vectorclass-addon/vector3d/
-INC_EIGEN = -isystem ./submodules/eigen/
diff --git a/MAKE/Makefile.lumi_cray b/MAKE/Makefile.lumi_cray
@@ -78,11 +78,3 @@ LIB_VLSV = -L$(LIBRARY_PREFIX)/vlsv -lvlsv -Wl,-rpath=$(LIBRARY_PREFIX)/vlsv
 
 LIB_PROFILE = -L$(LIBRARY_PREFIX)/phiprof/lib -lphiprof -lgfortran -Wl,-rpath=$(LIBRARY_PREFIX)/phiprof/lib
 INC_PROFILE = -I$(LIBRARY_PREFIX)/phiprof/include 
-
-
-#header libraries
-
-INC_FSGRID = -I./submodules/fsgrid
-INC_DCCRG = -I./submodules/dccrg
-INC_VECTORCLASS = -isystem ./submodules/vectorclass/ -isystem ./submodules/vectorclass-addon/vector3d/
-INC_EIGEN = -isystem ./submodules/eigen/
diff --git a/MAKE/Makefile.lumi_gnu b/MAKE/Makefile.lumi_gnu
@@ -77,11 +77,3 @@ LIB_VLSV = -L$(LIBRARY_PREFIX)/vlsv -lvlsv -Wl,-rpath=$(LIBRARY_PREFIX)/vlsv
 
 LIB_PROFILE = -L$(LIBRARY_PREFIX)/phiprof/lib -lphiprof -lgfortran -Wl,-rpath=$(LIBRARY_PREFIX)/phiprof/lib
 INC_PROFILE = -I$(LIBRARY_PREFIX)/phiprof/include 
-
-
-#header libraries
-
-INC_FSGRID = -I./submodules/fsgrid
-INC_DCCRG = -I./submodules/dccrg
-INC_VECTORCLASS = -isystem ./submodules/vectorclass/ -isystem ./submodules/vectorclass-addon/vector3d/
-INC_EIGEN = -isystem ./submodules/eigen/
diff --git a/MAKE/Makefile.lumi_gnu358 b/MAKE/Makefile.lumi_gnu358
@@ -77,11 +77,3 @@ LIB_VLSV = -L$(LIBRARY_PREFIX)/vlsv -lvlsv -Wl,-rpath=$(LIBRARY_PREFIX)/vlsv
 
 LIB_PROFILE = -L$(LIBRARY_PREFIX)/phiprof/lib -lphiprof -lgfortran -Wl,-rpath=$(LIBRARY_PREFIX)/phiprof/lib
 INC_PROFILE = -I$(LIBRARY_PREFIX)/phiprof/include 
-
-
-#header libraries
-
-INC_FSGRID = -I./submodules/fsgrid/
-INC_DCCRG = -I./submodules/dccrg/
-INC_VECTORCLASS = -isystem ./submodules/vectorclass/ -isystem ./submodules/vectorclass-addon/vector3d/
-INC_EIGEN = -isystem ./submodules/eigen/
diff --git a/MAKE/Makefile.mahti_gcc b/MAKE/Makefile.mahti_gcc
@@ -83,9 +83,3 @@ LIB_VLSV = -L$(LIBRARY_PREFIX)/vlsv -lvlsv -Wl,-rpath=$(LIBRARY_PREFIX)/vlsv
 
 LIB_PROFILE = -L$(LIBRARY_PREFIX)/phiprof/lib -lphiprof -Wl,-rpath=$(LIBRARY_PREFIX)/phiprof/lib
 INC_PROFILE = -I$(LIBRARY_PREFIX)/phiprof/include
-
-# header libraries
-INC_FSGRID = -I./submodules/fsgrid
-INC_DCCRG = -I./submodules/dccrg
-INC_VECTORCLASS = -isystem ./submodules/vectorclass/ -isystem ./submodules/vectorclass-addon/vector3d/
-INC_EIGEN = -isystem ./submodules/eigen/
diff --git a/MAKE/Makefile.marconi b/MAKE/Makefile.marconi
@@ -83,10 +83,3 @@ LIB_JEMALLOC = -L$(LIBRARY_PREFIX)/jemalloc/lib -ljemalloc -Wl,-rpath,$(LIBRARY_
 #system
 INC_PAPI = -I$(LIBRARY_PREFIX)/papi/include
 LIB_PAPI = -L$(LIBRARY_PREFIX)/papi/lib -lpapi -lpfm
-
-#header libraries
-
-INC_FSGRID = -I./submodules/fsgrid
-INC_DCCRG = -I./submodules/dccrg
-INC_VECTORCLASS = -isystem ./submodules/vectorclass/ -isystem ./submodules/vectorclass-addon/vector3d/
-INC_EIGEN = -isystem ./submodules/eigen/
diff --git a/MAKE/Makefile.perlmutter_gcc b/MAKE/Makefile.perlmutter_gcc
@@ -79,11 +79,3 @@ LIB_VLSV = -L$(LIBRARY_PREFIX)/vlsv -lvlsv -Wl,-rpath=$(LIBRARY_PREFIX)/vlsv
 
 LIB_PROFILE = -L$(LIBRARY_PREFIX)/phiprof/lib -lphiprof -lgfortran -Wl,-rpath=$(LIBRARY_PREFIX)/phiprof/lib
 INC_PROFILE = -I$(LIBRARY_PREFIX)/phiprof/include 
-
-
-#header libraries
-
-INC_FSGRID = -I./submodules/fsgrid
-INC_DCCRG = -I./submodules/dccrg
-INC_VECTORCLASS = -isystem ./submodules/vectorclass/ -isystem ./submodules/vectorclass-addon/vector3d/
-INC_EIGEN = -isystem ./submodules/eigen/
diff --git a/MAKE/Makefile.puhti_gcc b/MAKE/Makefile.puhti_gcc
@@ -81,11 +81,3 @@ INC_PROFILE = -I$(LIBRARY_PREFIX)/hpcx-mpi/$(MPT_VERSION)/$(CC_BRAND)/$(CC_BRAND
 
 LIB_PAPI = -L$(LIBRARY_PREFIX)/hpcx-mpi/$(MPT_VERSION)/$(CC_BRAND)/$(CC_BRAND_VERSION)/papi/lib -lpapi -Wl,-rpath=$(LIBRARY_PREFIX)/hpcx-mpi/$(MPT_VERSION)/$(CC_BRAND)/$(CC_BRAND_VERSION)/papi/lib
 INC_PAPI = -I$(LIBRARY_PREFIX)/hpcx-mpi/$(MPT_VERSION)/$(CC_BRAND)/$(CC_BRAND_VERSION)/papi/include
-
-
-#header libraries
-
-INC_FSGRID = -I./submodules/fsgrid
-INC_DCCRG = -I./submodules/dccrg
-INC_VECTORCLASS = -isystem ./submodules/vectorclass/ -isystem ./submodules/vectorclass-addon/vector3d/
-INC_EIGEN = -isystem ./submodules/eigen/
diff --git a/MAKE/Makefile.puhti_intel b/MAKE/Makefile.puhti_intel
@@ -85,11 +85,3 @@ INC_PROFILE = -I$(LIBRARY_PREFIX)/hpcx-mpi/$(MPT_VERSION)/$(CC_BRAND)/$(CC_BRAND
 
 LIB_PAPI = -L$(LIBRARY_PREFIX)/hpcx-mpi/$(MPT_VERSION)/$(CC_BRAND)/$(CC_BRAND_VERSION)/papi/lib -lpapi -Wl,-rpath=$(LIBRARY_PREFIX)/hpcx-mpi/$(MPT_VERSION)/$(CC_BRAND)/$(CC_BRAND_VERSION)/papi/lib
 INC_PAPI = -I$(LIBRARY_PREFIX)/hpcx-mpi/$(MPT_VERSION)/$(CC_BRAND)/$(CC_BRAND_VERSION)/papi/include
-
-
-#header libraries
-
-INC_FSGRID = -I./submodules/fsgrid
-INC_DCCRG = -I./submodules/dccrg
-INC_VECTORCLASS = -isystem ./submodules/vectorclass/ -isystem ./submodules/vectorclass-addon/vector3d/
-INC_EIGEN = -isystem ./submodules/eigen/
diff --git a/MAKE/Makefile.puhti_pgi b/MAKE/Makefile.puhti_pgi
@@ -84,11 +84,3 @@ INC_PROFILE = -I$(LIBRARY_PREFIX)/openmpi/$(MPT_VERSION)/$(CC_BRAND)/$(CC_BRAND_
 
 #LIB_PAPI = -L$(LIBRARY_PREFIX)/openmpi/$(MPT_VERSION)/$(CC_BRAND)/$(CC_BRAND_VERSION)/papi/lib -lpapi -Wl,-rpath=$(LIBRARY_PREFIX)/openmpi/$(MPT_VERSION)/$(CC_BRAND)/$(CC_BRAND_VERSION)/papi/lib
 #INC_PAPI = -I$(LIBRARY_PREFIX)/openmpi/$(MPT_VERSION)/$(CC_BRAND)/$(CC_BRAND_VERSION)/papi/include
-
-
-#header libraries
-
-INC_FSGRID = -I./submodules/fsgrid
-INC_DCCRG = -I./submodules/dccrg
-INC_VECTORCLASS = -isystem ./submodules/vectorclass/ -isystem ./submodules/vectorclass-addon/vector3d/
-INC_EIGEN = -isystem ./submodules/eigen/
diff --git a/MAKE/Makefile.ukko_gcc_openmpi b/MAKE/Makefile.ukko_gcc_openmpi
@@ -110,9 +110,3 @@ INC_ZOLTAN = -I$(LIBRARY_PREFIX)/$(CC_BRAND)/$(CC_BRAND_VERSION)/$(MPT_BRAND)/$(
 #LIB_PAPI = -L$(LIBRARY_PREFIX)/$(CC_BRAND)/$(CC_BRAND_VERSION)/$(MPT_BRAND)/$(MPT_VERSION)/ukko/papi/lib -lpapi -Wl,-rpath=$(LIBRARY_PREFIX)/$(CC_BRAND)/$(CC_BRAND_VERSION)/$(MPT_BRAND)/$(MPT_VERSION)/carrington/papi/lib
 #INC_PAPI = -I$(LIBRARY_PREFIX)/$(CC_BRAND)/$(CC_BRAND_VERSION)/$(MPT_BRAND)/$(MPT_VERSION)/ukko/papi/include
 LIB_PAPI = -lpapi
-
-#header libraries
-INC_FSGRID = -I./submodules/fsgrid
-INC_DCCRG = -I./submodules/dccrg
-INC_VECTORCLASS = -isystem ./submodules/vectorclass/ -isystem ./submodules/vectorclass-addon/vector3d/
-INC_EIGEN = -isystem ./submodules/eigen/
diff --git a/MAKE/Makefile.vorna_gcc b/MAKE/Makefile.vorna_gcc
@@ -89,11 +89,3 @@ INC_PROFILE = -I$(LIBRARY_PREFIX)/$(CC_BRAND)/$(CC_BRAND_VERSION)/$(MPT_BRAND)/$
 
 LIB_PAPI = -L$(LIBRARY_PREFIX)/$(CC_BRAND)/$(CC_BRAND_VERSION)/$(MPT_BRAND)/$(MPT_VERSION)/vorna/papi/lib -lpapi -Wl,-rpath=$(LIBRARY_PREFIX)/$(CC_BRAND)/$(CC_BRAND_VERSION)/$(MPT_BRAND)/$(MPT_VERSION)/vorna/papi/lib
 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 = -isystem ./submodules/vectorclass/ -isystem ./submodules/vectorclass-addon/vector3d/
-INC_EIGEN = -isystem ./submodules/eigen/
-
-
diff --git 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 = VEC8F_AGNER
 else
 #Double-precision
-        INC_VECTORCLASS = -I ./submodules/vectorclass/ -I ./submodules/vectorclass-addon/vector3d/
 	VECTORCLASS = VEC4D_AGNER
 endif
 
@@ -63,15 +61,9 @@ 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
 
 LIB_PROFILE = -L$(LIBRARY_PREFIX)/phiprof/lib -lphiprof
 INC_PROFILE = -I$(LIBRARY_PREFIX)/phiprof/include
 INC_TOPO =
-
-INC_EIGEN = -isystem ./submodules/eigen/
diff --git a/Makefile b/Makefile
@@ -21,6 +21,12 @@ 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/
+INC_EIGEN = -I ./submodules/eigen/
 
 include MAKE/Makefile.${ARCH}