Commit 35e04973 authored by Giacomo Mulas's avatar Giacomo Mulas
Browse files

Merge branch 'containers-m10' into 'master' 

Containers m10

See merge request giacomo.mulas/np_tmcode!84
parents 1361dec8 7dde8b9f

containers/docker/Dockerfile

+8 −8
Original line number Diff line number Diff line
@@ -57,19 +57,19 @@ ADD doc /root/np-tmcode/doc 
ADD build /root/np-tmcode/build

ADD test_data /root/np-tmcode/test_data

#RUN cd np-tmcode/src && BUILDDIR=../../build BUILDDIR_NPTM=../../build/libnptm LIBNPTM=../../build/libnptm/libnptm.a USE_ILP64=1 USE_LAPACK=1 USE_MAGMA=1 USE_OPENMP=1 USE_MPI=1 CXX=mpicxx FC=gfortran make wipe && BUILDDIR=../../build BUILDDIR_NPTM=../../build/libnptm LIBNPTM=../../build/libnptm/libnptm.a USE_ILP64=1 USE_LAPACK=1 USE_MAGMA=1 USE_OPENMP=1 USE_MPI=1 CXX=mpicxx FC=gfortran make -j && mv ../build/cluster/np_cluster ../build/cluster/np_cluster_magma_mpi

RUN cd np-tmcode/build && CXX=mpicxx FC=gfortran ./configure --enable-openmp --with-lapack --with-magma --enable-refinement --without-cublas && make clean && make -j && mv cluster/np_cluster cluster/np_cluster_magma_mpi && mv sphere/np_sphere sphere/np_sphere_magma_mpi && mv inclusion/np_inclusion inclusion/np_inclusion_magma_mpi && mv trapping/np_trapping trapping/np_trapping_magma_mpi

RUN cd np-tmcode/build && CXX=mpicxx FC=gfortran ./configure --enable-openmp --with-lapack --with-magma --enable-refinement --without-cublas && make clean && make -j && mv cluster/np_cluster cluster/np_cluster_magma_mpi && mv inclusion/np_inclusion inclusion/np_inclusion_magma_mpi 

#RUN cd np-tmcode/src && BUILDDIR=../../build BUILDDIR_NPTM=../../build/libnptm LIBNPTM=../../build/libnptm/libnptm.a USE_ILP64=1 USE_LAPACK=1 USE_MAGMA=1 USE_OPENMP=1 CXX=g++ FC=gfortran make wipe && BUILDDIR=../../build BUILDDIR_NPTM=../../build/libnptm LIBNPTM=../../build/libnptm/libnptm.a USE_ILP64=1 USE_LAPACK=1 USE_MAGMA=1 USE_OPENMP=1 CXX=g++ FC=gfortran make -j && mv ../build/cluster/np_cluster ../build/cluster/np_cluster_magma_serial

RUN cd np-tmcode/build && CXX=g++ FC=gfortran ./configure --enable-openmp --with-lapack --with-magma --enable-refinement --without-cublas && make clean && make -j && mv cluster/np_cluster cluster/np_cluster_magma_serial && mv sphere/np_sphere sphere/np_sphere_magma_serial && mv inclusion/np_inclusion inclusion/np_inclusion_magma_serial && mv trapping/np_trapping trapping/np_trapping_magma_serial

RUN cd np-tmcode/build && CXX=mpicxx FC=gfortran ./configure --enable-openmp --with-lapack --without-magma --enable-refinement --with-cublas && make clean && make -j && mv cluster/np_cluster cluster/np_cluster_cublas_mpi && mv sphere/np_sphere sphere/np_sphere_cublas_mpi && mv inclusion/np_inclusion inclusion/np_inclusion_cublas_mpi && mv trapping/np_trapping trapping/np_trapping_cublas_mpi

RUN cd np-tmcode/build && CXX=g++ FC=gfortran ./configure --enable-openmp --with-lapack --without-magma --enable-refinement --with-cublas && make clean && make -j && mv cluster/np_cluster cluster/np_cluster_cublas_serial && mv sphere/np_sphere sphere/np_sphere_cublas_serial && mv inclusion/np_inclusion inclusion/np_inclusion_cublas_serial && mv trapping/np_trapping trapping/np_trapping_cublas_serial

RUN cd np-tmcode/build && CXX=g++ FC=gfortran ./configure --enable-openmp --with-lapack --with-magma --enable-refinement --without-cublas && make clean && make -j && mv cluster/np_cluster cluster/np_cluster_magma_serial && mv inclusion/np_inclusion inclusion/np_inclusion_magma_serial 

RUN cd np-tmcode/build && CXX=mpicxx FC=gfortran ./configure --enable-openmp --with-lapack --without-magma --enable-refinement --with-cublas && make clean && make -j && mv cluster/np_cluster cluster/np_cluster_cublas_mpi && mv inclusion/np_inclusion inclusion/np_inclusion_cublas_mpi 

RUN cd np-tmcode/build && CXX=g++ FC=gfortran ./configure --enable-openmp --with-lapack --without-magma --enable-refinement --with-cublas && make clean && make -j && mv cluster/np_cluster cluster/np_cluster_cublas_serial && mv inclusion/np_inclusion inclusion/np_inclusion_cublas_serial 

#RUN cd np-tmcode/src && BUILDDIR=../../build BUILDDIR_NPTM=../../build/libnptm LIBNPTM=../../build/libnptm/libnptm.a USE_ILP64=1 USE_LAPACK=1 USE_OPENMP=1 USE_MPI=1 CXX=mpicxx FC=gfortran make wipe && BUILDDIR=../../build BUILDDIR_NPTM=../../build/libnptm LIBNPTM=../../build/libnptm/libnptm.a USE_ILP64=1 USE_LAPACK=1 USE_OPENMP=1 USE_MPI=1 CXX=mpicxx FC=gfortran make -j && mv ../build/cluster/np_cluster ../build/cluster/np_cluster_lapack_mpi && cd ../build/cluster && ln -s np_cluster_lapack_mpi np_cluster

RUN cd np-tmcode/build && CXX=mpicxx FC=gfortran ./configure --enable-openmp --with-lapack --without-magma --enable-refinement --without-cublas && make clean && make -j && mv cluster/np_cluster cluster/np_cluster_lapack_mpi && mv sphere/np_sphere sphere/np_sphere_lapack_mpi && mv inclusion/np_inclusion inclusion/np_inclusion_lapack_mpi && mv trapping/np_trapping trapping/np_trapping_lapack_mpi && cd cluster && ln -s np_cluster_lapack_mpi np_cluster && cd ../sphere && ln -s np_sphere_lapack_mpi np_sphere && cd ../inclusion && ln -s np_inclusion_lapack_mpi np_inclusion && cd ../trapping && ln -s np_trapping_lapack_mpi np_trapping   

RUN cd np-tmcode/build && CXX=mpicxx FC=gfortran ./configure --enable-openmp --with-lapack --without-magma --enable-refinement --without-cublas && make clean && make -j && mv cluster/np_cluster cluster/np_cluster_lapack_mpi && mv inclusion/np_inclusion inclusion/np_inclusion_lapack_mpi && mv trapping/np_trapping trapping/np_trapping_lapack_mpi && cd cluster && ln -s np_cluster_lapack_mpi np_cluster && cd ../inclusion && ln -s np_inclusion_lapack_mpi np_inclusion 

#RUN cd np-tmcode/src && BUILDDIR=../../build BUILDDIR_NPTM=../../build/libnptm LIBNPTM=../../build/libnptm/libnptm.a USE_ILP64=1 USE_LAPACK=1 USE_OPENMP=1 CXX=g++ FC=gfortran make wipe && BUILDDIR=../../build BUILDDIR_NPTM=../../build/libnptm LIBNPTM=../../build/libnptm/libnptm.a USE_ILP64=1 USE_LAPACK=1 USE_OPENMP=1 CXX=g++ FC=gfortran make -j && mv ../build/cluster/np_cluster ../build/cluster/np_cluster_lapack_serial

RUN cd np-tmcode/build && CXX=g++ FC=gfortran ./configure --enable-openmp --with-lapack --without-magma --enable-refinement --without-cublas && make clean && make -j && mv cluster/np_cluster cluster/np_cluster_lapack_serial && mv sphere/np_sphere sphere/np_sphere_lapack_serial && mv inclusion/np_inclusion inclusion/np_inclusion_lapack_serial && mv trapping/np_trapping trapping/np_trapping_lapack_serial

RUN cd np-tmcode/build && CXX=g++ FC=gfortran ./configure --enable-openmp --with-lapack --without-magma --enable-refinement --without-cublas && make clean && make -j && mv cluster/np_cluster cluster/np_cluster_lapack_serial && mv inclusion/np_inclusion inclusion/np_inclusion_lapack_serial 

#RUN cd np-tmcode/src && BUILDDIR=../../build BUILDDIR_NPTM=../../build/libnptm LIBNPTM=../../build/libnptm/libnptm.a USE_ILP64=1 USE_OPENMP=1 USE_MPI=1 CXX=mpicxx FC=gfortran make wipe && BUILDDIR=../../build BUILDDIR_NPTM=../../build/libnptm LIBNPTM=../../build/libnptm/libnptm.a USE_ILP64=1 USE_OPENMP=1 USE_MPI=1 CXX=mpicxx FC=gfortran make -j && mv ../build/cluster/np_cluster ../build/cluster/np_cluster_legacy_mpi

RUN cd np-tmcode/build && CXX=mpicxx FC=gfortran ./configure --enable-openmp --without-lapack --without-magma --without-cublas && make clean && make -j && mv cluster/np_cluster cluster/np_cluster_legacy_mpi && mv sphere/np_sphere sphere/np_sphere_legacy_mpi && mv inclusion/np_inclusion inclusion/np_inclusion_legacy_mpi && mv trapping/np_trapping trapping/np_trapping_legacy_mpi

RUN cd np-tmcode/build && CXX=mpicxx FC=gfortran ./configure --enable-openmp --without-lapack --without-magma --without-cublas && make clean && make -j && mv cluster/np_cluster cluster/np_cluster_legacy_mpi && mv sphere/np_sphere sphere/np_sphere_legacy_mpi && mv inclusion/np_inclusion inclusion/np_inclusion_legacy_mpi && cd sphere && ln -s np_sphere_legacy_mpi np_sphere

#RUN cd np-tmcode/src && BUILDDIR=../../build BUILDDIR_NPTM=../../build/libnptm LIBNPTM=../../build/libnptm/libnptm.a USE_ILP64=1 USE_OPENMP=1 CXX=g++ FC=gfortran make wipe && BUILDDIR=../../build BUILDDIR_NPTM=../../build/libnptm LIBNPTM=../../build/libnptm/libnptm.a USE_ILP64=1 USE_OPENMP=1 CXX=g++ FC=gfortran make -j && mv ../build/cluster/np_cluster ../build/cluster/np_cluster_legacy_serial

RUN cd np-tmcode/build && CXX=g++ FC=gfortran ./configure --disable-openmp --without-lapack --without-magma --without-cublas && make clean && make -j && mv cluster/np_cluster cluster/np_cluster_legacy_serial && mv sphere/np_sphere sphere/np_sphere_legacy_serial && mv inclusion/np_inclusion inclusion/np_inclusion_legacy_serial && mv trapping/np_trapping trapping/np_trapping_legacy_serial

RUN cd np-tmcode/build && CXX=g++ FC=gfortran ./configure --disable-openmp --without-lapack --without-magma --without-cublas && make clean && make -j && mv cluster/np_cluster cluster/np_cluster_legacy_serial && mv sphere/np_sphere sphere/np_sphere_legacy_serial && mv inclusion/np_inclusion inclusion/np_inclusion_legacy_serial 

RUN cd np-tmcode/doc/src && doxygen config.dox && cd ../build/latex && make -j

containers/singularity/np-tmcode-run.def

+17 −17
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ Stage: np-tmcode-run-dev 
	make -j

	mv cluster/np_cluster cluster/np_cluster_magma_mpi

	mv inclusion/np_inclusion inclusion/np_inclusion_magma_mpi

	mv sphere/np_sphere sphere/np_sphere_magma_mpi

	mv trapping/np_trapping trapping/np_trapping_magma_mpi

	#mv sphere/np_sphere sphere/np_sphere_magma_mpi

	#mv trapping/np_trapping trapping/np_trapping_magma_mpi

	# with magma, ilp64, no mpi, openmp

	#BUILDDIR=../../build BUILDDIR_NPTM=../../build/libnptm LIBNPTM=../../build/libnptm/libnptm.a USE_ILP64=1 USE_LAPACK=1 USE_MAGMA=1 USE_OPENMP=1 CXX=g++ FC=gfortran make wipe

	CXX=g++ FC=gfortran ./configure --disable-shared --enable-ilp64 --enable-openmp --with-lapack --with-magma --enable-refinement --without-cublas
@@ -43,8 +43,8 @@ Stage: np-tmcode-run-dev 
	make -j

	mv cluster/np_cluster cluster/np_cluster_magma_serial

	mv inclusion/np_inclusion inclusion/np_inclusion_magma_serial

	mv sphere/np_sphere sphere/np_sphere_magma_serial

	mv trapping/np_trapping trapping/np_trapping_magma_serial

	#mv sphere/np_sphere sphere/np_sphere_magma_serial

	#mv trapping/np_trapping trapping/np_trapping_magma_serial

	# with cublas, ilp64, mpi, openmp

	#BUILDDIR=../../build BUILDDIR_NPTM=../../build/libnptm LIBNPTM=../../build/libnptm/libnptm.a USE_ILP64=1 USE_LAPACK=1 USE_MAGMA=1 USE_OPENMP=1 USE_MPI=1 CXX=mpicxx FC=gfortran make wipe

	CXX=mpicxx FC=gfortran ./configure  --disable-shared --enable-refinement --enable-openmp --with-lapack --without-magma --with-cublas
@@ -52,8 +52,8 @@ Stage: np-tmcode-run-dev 
	make -j

	mv cluster/np_cluster cluster/np_cluster_cublas_mpi

	mv inclusion/np_inclusion inclusion/np_inclusion_cublas_mpi

	mv sphere/np_sphere sphere/np_sphere_cublas_mpi

	mv trapping/np_trapping trapping/np_trapping_cublas_mpi

	#mv sphere/np_sphere sphere/np_sphere_cublas_mpi

	#mv trapping/np_trapping trapping/np_trapping_cublas_mpi

	# with cublas, ilp64, no mpi, openmp

	#BUILDDIR=../../build BUILDDIR_NPTM=../../build/libnptm LIBNPTM=../../build/libnptm/libnptm.a USE_ILP64=1 USE_LAPACK=1 USE_MAGMA=1 USE_OPENMP=1 CXX=g++ FC=gfortran make wipe

	CXX=g++ FC=gfortran ./configure --disable-shared --enable-ilp64 --enable-openmp --with-lapack --without-magma --enable-refinement --with-cublas
@@ -61,8 +61,8 @@ Stage: np-tmcode-run-dev 
	make -j

	mv cluster/np_cluster cluster/np_cluster_cublas_serial

	mv inclusion/np_inclusion inclusion/np_inclusion_cublas_serial

	mv sphere/np_sphere sphere/np_sphere_cublas_serial

	mv trapping/np_trapping trapping/np_trapping_cublas_serial

	#mv sphere/np_sphere sphere/np_sphere_cublas_serial

	#mv trapping/np_trapping trapping/np_trapping_cublas_serial

	# with lapack, ilp64, mpi, openmp

	#BUILDDIR=../../build BUILDDIR_NPTM=../../build/libnptm LIBNPTM=../../build/libnptm/libnptm.a USE_ILP64=1 USE_LAPACK=1 USE_OPENMP=1 USE_MPI=1 CXX=mpicxx FC=gfortran make wipe

	CXX=mpicxx FC=gfortran ./configure --disable-shared --enable-ilp64 --enable-openmp --with-lapack --without-magma --enable-refinement --without-cublas
@@ -70,8 +70,8 @@ Stage: np-tmcode-run-dev 
	make -j

	mv cluster/np_cluster cluster/np_cluster_lapack_mpi

	mv inclusion/np_inclusion inclusion/np_inclusion_lapack_mpi

	mv sphere/np_sphere sphere/np_sphere_lapack_mpi

	mv trapping/np_trapping trapping/np_trapping_lapack_mpi

	#mv sphere/np_sphere sphere/np_sphere_lapack_mpi

	#mv trapping/np_trapping trapping/np_trapping_lapack_mpi

	# with lapack, ilp64, no mpi, openmp

	#BUILDDIR=../../build BUILDDIR_NPTM=../../build/libnptm LIBNPTM=../../build/libnptm/libnptm.a USE_ILP64=1 USE_LAPACK=1 USE_OPENMP=1 CXX=g++ FC=gfortran make wipe

	CXX=g++ FC=gfortran ./configure --enable-ilp64 --enable-openmp --with-lapack --without-magma --disable-shared --enable-refinement --without-cublas
@@ -79,8 +79,8 @@ Stage: np-tmcode-run-dev 
	make -j

	mv cluster/np_cluster cluster/np_cluster_lapack_serial

	mv inclusion/np_inclusion inclusion/np_inclusion_lapack_serial

	mv sphere/np_sphere sphere/np_sphere_lapack_serial

	mv trapping/np_trapping trapping/np_trapping_lapack_serial

	#mv sphere/np_sphere sphere/np_sphere_lapack_serial

	#mv trapping/np_trapping trapping/np_trapping_lapack_serial

	# with lucin, ilp64, mpi, openmp

	#BUILDDIR=../../build BUILDDIR_NPTM=../../build/libnptm LIBNPTM=../../build/libnptm/libnptm.a USE_ILP64=1 USE_OPENMP=1 USE_MPI=1 CXX=mpicxx FC=gfortran make wipe

	CXX=mpicxx FC=gfortran ./configure --enable-ilp64 --enable-openmp --without-lapack --without-magma --disable-shared --without-cublas
@@ -89,7 +89,7 @@ Stage: np-tmcode-run-dev 
	mv cluster/np_cluster cluster/np_cluster_legacy_mpi

	mv inclusion/np_inclusion inclusion/np_inclusion_legacy_mpi

	mv sphere/np_sphere sphere/np_sphere_legacy_mpi

	mv trapping/np_trapping trapping/np_trapping_legacy_mpi

	#mv trapping/np_trapping trapping/np_trapping_legacy_mpi

	# with lucin, ilp64, no mpi, openmp

	#BUILDDIR=../../build BUILDDIR_NPTM=../../build/libnptm LIBNPTM=../../build/libnptm/libnptm.a USE_ILP64=1 USE_OPENMP=1 CXX=g++ FC=gfortran make wipe

	CXX=g++ FC=gfortran ./configure --enable-ilp64 --enable-openmp --without-lapack --without-magma --disable-shared --without-cublas
@@ -98,7 +98,7 @@ Stage: np-tmcode-run-dev 
	mv cluster/np_cluster cluster/np_cluster_legacy_serial

	mv inclusion/np_inclusion inclusion/np_inclusion_legacy_serial

	mv sphere/np_sphere sphere/np_sphere_legacy_serial

	mv trapping/np_trapping trapping/np_trapping_legacy_serial

	#mv trapping/np_trapping trapping/np_trapping_legacy_serial

	#cd ../doc/src

	#doxygen config.dox

	#cd ../build/latex
@@ -109,9 +109,9 @@ Stage: np-tmcode-run-dev 
	cd ../inclusion

	ln -s np_inclusion_lapack_mpi np_inclusion

	cd ../sphere

	ln -s np_sphere_lapack_mpi np_sphere

	cd ../trapping

	ln -s np_trapping_lapack_mpi np_trapping

	ln -s np_sphere_legacy_mpi np_sphere

	# cd ../trapping

	# ln -s np_trapping_lapack_mpi np_trapping





Bootstrap: docker

containers/singularity/scripts/clu

0 → 120000
+1 −0
Original line number Diff line number Diff line 
singwrapper
 
 No newline at end of file

containers/singularity/scripts/edfb_clu

0 → 120000
+1 −0
Original line number Diff line number Diff line 
singwrapper
 
 No newline at end of file

containers/singularity/scripts/edfb_inclu

0 → 120000
+1 −0
Original line number Diff line number Diff line 
singwrapper
 
 No newline at end of file