Skip to content
Snippets Groups Projects
Commit d01e05af authored by Giacomo Mulas's avatar Giacomo Mulas
Browse files

Merge branch 'containers' into 'master' 

rebuild the singularity image with the current master version

See merge request giacomo.mulas/np_tmcode!18
parents e81c6997 a4922e96
Branches shaditest test1
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml
+ 7
− 7
View file @ d01e05af
......@@ -47,19 +47,19 @@ building_stage:
- cat /etc/os-release
- cd src
- echo "Running make with gnu compilers version 11..."
- make wipe && CXX=g++-11 FC=gfortran-11 make -j
- make clean && BUILDDIR=$PWD/../build_gnu11 CXX=g++-11 FC=gfortran-11 make
- echo "Running make with gnu compilers version 12..."
- make wipe && CXX=g++-12 FC=gfortran-12 make -j
- make clean && BUILDDIR=$PWD/../build_gnu12 CXX=g++-12 FC=gfortran-12 make
- echo "Running make with gnu fortran version 12 and clang version 13..."
- make wipe && CXX="clang++-13 -stdlib=libc++" FC=gfortran-12 make -j
- make clean && BUILDDIR=$PWD/../build_clang13 CXX="clang++-13 -stdlib=libc++" FC=gfortran-12 make
- echo "Running make with gnu fortran version 12 and clang version 14..."
- make wipe && CXX="clang++-14 -stdlib=libc++" FC=gfortran-12 make -j
- make clean && BUILDDIR=$PWD/../build_clang14 CXX="clang++-14 -stdlib=libc++" FC=gfortran-12 make
- echo "Running make with gnu fortran version 12 and clang version 15..."
- make wipe && CXX="clang++-15 -stdlib=libc++" FC=gfortran-12 make -j
- make clean && BUILDDIR=$PWD/../build_clang15 CXX="clang++-15 -stdlib=libc++" FC=gfortran-12 make
- echo "Running make with gnu fortran version 12 and clang version 16..."
- make wipe && CXX="clang++-16 -stdlib=libc++" FC=gfortran-12 make -j
- make clean && BUILDDIR=$PWD/../build_clang16 CXX="clang++-16 -stdlib=libc++" FC=gfortran-12 make
- echo "Finally running make with default compilers..."
- make wipe && make -j
- make clean && make
- make docs -j && make -C ../doc/build/latex -j
running_stage:
......
containers/singularity/np-tmcode-run.sif
+ 0
− 0
View file @ d01e05af
No preview for this file type
src/Makefile
+ 18
− 11
View file @ d01e05af
SUBDIRS := cluster sphere testing trapping
SRCDIR=$(PWD)
OBJDIR=$(SRCDIR)/objects
BUILDDIR=$(SRCDIR)/../build
ifndef BUILDDIR
override BUILDDIR=$(SRCDIR)/../build
endif
DOCSDIR=$(SRCDIR)/../doc
all: $(SUBDIRS)
all: $(SUBDIRS) $(BUILDDIR)
docs:
cd $(DOCSDIR)/src; doxygen config.dox
$(SUBDIRS):
$(BUILDDIR):
mkdir -p $(BUILDDIR)
$(SUBDIRS): $(BUILDDIR)
$(MAKE) -C $@
clean:
rm -f $(OBJDIR)/*.o
clean: $(BUILDDIR)
$(MAKE) -C cluster clean
$(MAKE) -C sphere clean
$(MAKE) -C trapping clean
$(MAKE) -C testing clean
wipe:
rm -f $(BUILDDIR)/cluster/*
rm -f $(BUILDDIR)/sphere/*
rm -f $(BUILDDIR)/testing/*
rm -f $(BUILDDIR)/trapping/*
rm -f $(OBJDIR)/*.o
wipe: $(BUILDDIR)
$(MAKE) -C cluster wipe
$(MAKE) -C sphere wipe
$(MAKE) -C trapping wipe
$(MAKE) -C testing wipe
if [ -d $(DOCSDIR)/build/html ]; then rm -r $(DOCSDIR)/build/html; fi
if [ -d $(DOCSDIR)/build/latex ]; then rm -r $(DOCSDIR)/build/latex; fi
......
src/cluster/Makefile
+ 15
− 9
View file @ d01e05af
ifndef BUILDDIR
override BUILDDIR=../../build/cluster
override BUILDDIR=../../build
endif
ifndef BUILDDIR_CLU
override BUILDDIR_CLU=$(BUILDDIR)/cluster
endif
ifndef OBJDIR
override OBJDIR=../objects
......@@ -13,20 +16,23 @@ F_CLU_OBJS=$(OBJDIR)/clu.o $(OBJDIR)/edfb_clu.o
CXX_CLU_OBJS=$(OBJDIR)/np_cluster.o $(OBJDIR)/Commons.o $(OBJDIR)/Configuration.o $(OBJDIR)/file_io.o $(OBJDIR)/Parsers.o $(OBJDIR)/sph_subs.o $(OBJDIR)/clu_subs.o $(OBJDIR)/cluster.o $(OBJDIR)/TransitionMatrix.o
all: $(BUILDDIR)/clu $(BUILDDIR)/edfb_clu $(BUILDDIR)/np_cluster
all: $(BUILDDIR_CLU)/clu $(BUILDDIR_CLU)/edfb_clu $(BUILDDIR_CLU)/np_cluster
$(BUILDDIR_CLU):
mkdir -p $(BUILDDIR_CLU)
$(BUILDDIR)/clu: $(OBJDIR)/clu.o
$(FC) $(FCFLAGS) -o $(BUILDDIR)/clu $(OBJDIR)/clu.o $(LDFLAGS)
$(BUILDDIR_CLU)/clu: $(OBJDIR)/clu.o $(BUILDDIR_CLU)
$(FC) $(FCFLAGS) -o $(BUILDDIR_CLU)/clu $(OBJDIR)/clu.o $(LDFLAGS)
$(BUILDDIR)/edfb_clu: $(OBJDIR)/edfb_clu.o
$(FC) $(FCFLAGS) -o $(BUILDDIR)/edfb_clu $(OBJDIR)/edfb_clu.o $(LDFLAGS)
$(BUILDDIR_CLU)/edfb_clu: $(OBJDIR)/edfb_clu.o $(BUILDDIR_CLU)
$(FC) $(FCFLAGS) -o $(BUILDDIR_CLU)/edfb_clu $(OBJDIR)/edfb_clu.o $(LDFLAGS)
$(BUILDDIR)/np_cluster: $(CXX_CLU_OBJS)
$(CXX) $(CXXFLAGS) -o $(BUILDDIR)/np_cluster $(CXX_CLU_OBJS) $(CXXLDFLAGS)
$(BUILDDIR_CLU)/np_cluster: $(CXX_CLU_OBJS) $(BUILDDIR_CLU)
$(CXX) $(CXXFLAGS) -o $(BUILDDIR_CLU)/np_cluster $(CXX_CLU_OBJS) $(CXXLDFLAGS)
clean:
rm -f $(F_CLU_OBJS) $(CXX_CLU_OBJS)
wipe:
rm -f $(BUILDDIR)/clu $(BUILDDIR)/edfb_clu $(F_CLU_OBJS) $(CXX_CLU_OBJS)
rm -f $(BUILDDIR_CLU)/clu $(BUILDDIR_CLU)/edfb_clu $(BUILDDIR_CLU)/np_cluster $(F_CLU_OBJS) $(CXX_CLU_OBJS)
src/sphere/Makefile
+ 15
− 9
View file @ d01e05af
ifndef BUILDDIR
override BUILDDIR=../../build/sphere
override BUILDDIR=../../build
endif
ifndef BUILDDIR_SPH
override BUILDDIR_SPH=$(BUILDDIR)/sphere
endif
ifndef OBJDIR
override OBJDIR=../objects
......@@ -12,20 +15,23 @@ F_SPH_OBJS=$(OBJDIR)/edfb_sph.o $(OBJDIR)/sph.o
CXX_SPH_OBJS=$(OBJDIR)/np_sphere.o $(OBJDIR)/Commons.o $(OBJDIR)/Configuration.o $(OBJDIR)/file_io.o $(OBJDIR)/Parsers.o $(OBJDIR)/sph_subs.o $(OBJDIR)/sphere.o $(OBJDIR)/TransitionMatrix.o
all: $(BUILDDIR)/edfb_sph $(BUILDDIR)/sph $(BUILDDIR)/np_sphere
all: $(BUILDDIR_SPH)/edfb_sph $(BUILDDIR_SPH)/sph $(BUILDDIR_SPH)/np_sphere
$(BUILDDIR_SPH):
mkdir -p $(BUILDDIR_SPH)
$(BUILDDIR)/edfb_sph: $(OBJDIR)/edfb_sph.o
$(FC) $(FCFLAGS) -o $(BUILDDIR)/edfb_sph $(OBJDIR)/edfb_sph.o $(LDFLAGS)
$(BUILDDIR_SPH)/edfb_sph: $(OBJDIR)/edfb_sph.o $(BUILDDIR_SPH)
$(FC) $(FCFLAGS) -o $(BUILDDIR_SPH)/edfb_sph $(OBJDIR)/edfb_sph.o $(LDFLAGS)
$(BUILDDIR)/sph: $(OBJDIR)/sph.o
$(FC) $(FCFLAGS) -o $(BUILDDIR)/sph $(OBJDIR)/sph.o $(LDFLAGS)
$(BUILDDIR_SPH)/sph: $(OBJDIR)/sph.o $(BUILDDIR_SPH)
$(FC) $(FCFLAGS) -o $(BUILDDIR_SPH)/sph $(OBJDIR)/sph.o $(LDFLAGS)
$(BUILDDIR)/np_sphere: $(CXX_SPH_OBJS)
$(CXX) $(CXXFLAGS) -o $(BUILDDIR)/np_sphere $(CXX_SPH_OBJS) $(CXXLDFLAGS)
$(BUILDDIR_SPH)/np_sphere: $(CXX_SPH_OBJS) $(BUILDDIR_SPH)
$(CXX) $(CXXFLAGS) -o $(BUILDDIR_SPH)/np_sphere $(CXX_SPH_OBJS) $(CXXLDFLAGS)
clean:
rm -f $(F_SPH_OBJS) $(CXX_SPH_OBJS)
wipe:
rm -f $(BUILDDIR)/edfb_sph $(BUILDDIR)/sph $(F_SPH_OBJS) $(CXX_SPH_OBJS)
rm -f $(BUILDDIR_SPH)/edfb_sph $(BUILDDIR_SPH)/sph $(BUILDDIR_SPH)/np_sphere $(F_SPH_OBJS) $(CXX_SPH_OBJS)
src/testing/Makefile
+ 13
− 7
View file @ d01e05af
ifndef BUILDDIR
override BUILDDIR=../../build/testing
override BUILDDIR=../../build
endif
ifndef BUILDDIR_TEST
override BUILDDIR_TEST=$(BUILDDIR)/testing
endif
ifndef OBJDIR
override OBJDIR=../objects
......@@ -12,16 +15,19 @@ CXX_TEDF_OBJS=$(OBJDIR)/test_TEDF.o $(OBJDIR)/Configuration.o $(OBJDIR)/file_io.
CXX_TTMS_OBJS=$(OBJDIR)/test_TTMS.o $(OBJDIR)/file_io.o $(OBJDIR)/Parsers.o $(OBJDIR)/TransitionMatrix.o
all: $(BUILDDIR)/test_TEDF $(BUILDDIR)/test_TTMS
all: $(BUILDDIR_TEST)/test_TEDF $(BUILDDIR_TEST)/test_TTMS
$(BUILDDIR_TEST):
mkdir -p $(BUILDDIR_TEST)
$(BUILDDIR)/test_TEDF: $(CXX_TEDF_OBJS)
$(CXX) $(CXXFLAGS) -o $(BUILDDIR)/test_TEDF $(CXX_TEDF_OBJS) $(CXXLDFLAGS)
$(BUILDDIR_TEST)/test_TEDF: $(CXX_TEDF_OBJS) $(BUILDDIR_TEST)
$(CXX) $(CXXFLAGS) -o $(BUILDDIR_TEST)/test_TEDF $(CXX_TEDF_OBJS) $(CXXLDFLAGS)
$(BUILDDIR)/test_TTMS: $(CXX_TTMS_OBJS)
$(CXX) $(CXXFLAGS) -o $(BUILDDIR)/test_TTMS $(CXX_TTMS_OBJS) $(CXXLDFLAGS)
$(BUILDDIR_TEST)/test_TTMS: $(CXX_TTMS_OBJS) $(BUILDDIR_TEST)
$(CXX) $(CXXFLAGS) -o $(BUILDDIR_TEST)/test_TTMS $(CXX_TTMS_OBJS) $(CXXLDFLAGS)
clean:
rm -f $(CXX_TEDF_OBJS) $(CXX_TTMS_OBJS)
wipe:
rm -f $(BUILDDIR)/test_TEDF $(BUILDDIR)/test_TTMS $(CXX_TEDF_OBJS) $(CXX_TTMS_OBJS)
rm -f $(BUILDDIR_TEST)/test_TEDF $(BUILDDIR_TEST)/test_TTMS $(CXX_TEDF_OBJS) $(CXX_TTMS_OBJS)
src/trapping/Makefile
+ 15
− 9
View file @ d01e05af
ifndef BUILDDIR
override BUILDDIR=../../build/trapping
override BUILDDIR=../../build
endif
ifndef BUILDDIR_TRA
override BUILDDIR_TRA=$(BUILDDIR)/trapping
endif
ifndef OBJDIR
override OBJDIR=../objects
......@@ -12,20 +15,23 @@ F_TRAP_OBJS=$(OBJDIR)/frfme.o $(OBJDIR)/lffft.o
CXX_TRAP_OBJS=$(OBJDIR)/np_trapping.o $(OBJDIR)/cfrfme.o $(OBJDIR)/clffft.o $(OBJDIR)/Parsers.o $(OBJDIR)/Commons.o $(OBJDIR)/Configuration.o $(OBJDIR)/file_io.o $(OBJDIR)/sph_subs.o $(OBJDIR)/tra_subs.o
all: $(BUILDDIR)/frfme $(BUILDDIR)/lffft $(BUILDDIR)/np_trapping
all: $(BUILDDIR_TRA)/frfme $(BUILDDIR_TRA)/lffft $(BUILDDIR_TRA)/np_trapping
$(BUILDDIR_TRA):
mkdir -p $(BUILDDIR_TRA)
$(BUILDDIR)/frfme: $(OBJDIR)/frfme.o
$(FC) $(FCFLAGS) -o $(BUILDDIR)/frfme $(OBJDIR)/frfme.o $(LDFLAGS)
$(BUILDDIR_TRA)/frfme: $(OBJDIR)/frfme.o $(BUILDDIR_TRA)
$(FC) $(FCFLAGS) -o $(BUILDDIR_TRA)/frfme $(OBJDIR)/frfme.o $(LDFLAGS)
$(BUILDDIR)/lffft: $(OBJDIR)/lffft.o
$(FC) $(FCFLAGS) -o $(BUILDDIR)/lffft $(OBJDIR)/lffft.o $(LDFLAGS)
$(BUILDDIR_TRA)/lffft: $(OBJDIR)/lffft.o $(BUILDDIR_TRA)
$(FC) $(FCFLAGS) -o $(BUILDDIR_TRA)/lffft $(OBJDIR)/lffft.o $(LDFLAGS)
$(BUILDDIR)/np_trapping: $(CXX_TRAP_OBJS)
$(CXX) $(CXXFLAGS) -o $(BUILDDIR)/np_trapping $(CXX_TRAP_OBJS) $(CXXLDFLAGS)
$(BUILDDIR_TRA)/np_trapping: $(CXX_TRAP_OBJS) $(BUILDDIR_TRA)
$(CXX) $(CXXFLAGS) -o $(BUILDDIR_TRA)/np_trapping $(CXX_TRAP_OBJS) $(CXXLDFLAGS)
clean:
rm -f $(F_TRAP_OBJS) $(CXX_TRAP_OBJS)
wipe:
rm -f $(BUILDDIR)/frfme $(BUILDDIR)/lffft $(F_TRAP_OBJS) $(CXX_TRAP_OBJS)
rm -f $(BUILDDIR_TRA)/frfme $(BUILDDIR_TRA)/lffft $(BUILDDIR_TRA)/np_trapping $(F_TRAP_OBJS) $(CXX_TRAP_OBJS)
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment