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

.gitlab-ci.yml

+7 −7
Original line number Diff line number Diff line
@@ -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

+876 KiB (41.6 MiB)

File changed.

No diff preview for this file type.

View original file
View changed file

src/Makefile

+18 −11
Original line number Diff line number Diff line 
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
Original line number Diff line number Diff line 
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
Original line number Diff line number Diff line 
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)