Commit 777e5ac7 authored by Giovanni La Mura's avatar Giovanni La Mura
Browse files

Merge branch 'dynamic_libs' into 'master' 

Dynamic libraries

See merge request giacomo.mulas/np_tmcode!70
parents 2e675f9c 67439a8e

.gitignore

+1 −1
Original line number Original line Diff line number Diff line
@@ -5,7 +5,7 @@ build/error.log 
build/inclusion/*

build/inclusion/*

build/libnptm/*

build/libnptm/*

build/libtool

build/libtool

build/Makefile

build/Makefile.in

build/sphere/*

build/sphere/*

build/testing/*

build/testing/*

build/trapping/*

build/trapping/*

.gitlab-ci.yml

+13 −13
Original line number Original line Diff line number Diff line
@@ -48,7 +48,7 @@ compatibility_stage: 
      - cd build_gnu11

      - cd build_gnu11

      - cp -r ../build/* .

      - cp -r ../build/* .

      - CXX=g++-11 F77=gfortran-11 ./configure

      - CXX=g++-11 F77=gfortran-11 ./configure

      - make clean

      - make wipe

      - make -j

      - make -j

      - echo "Running make with gnu compilers version 12..."

      - echo "Running make with gnu compilers version 12..."

      - cd ..

      - cd ..
@@ -57,7 +57,7 @@ compatibility_stage: 
      - cd build_gnu12

      - cd build_gnu12

      - cp -r ../build/* .

      - cp -r ../build/* .

      - CXX=g++-12 F77=gfortran-12 ./configure

      - CXX=g++-12 F77=gfortran-12 ./configure

      - make clean

      - make wipe

      - make -j

      - make -j

      - echo "Running make with gnu compilers version 13..."

      - echo "Running make with gnu compilers version 13..."

      - cd ..

      - cd ..
@@ -66,7 +66,7 @@ compatibility_stage: 
      - cd build_gnu13

      - cd build_gnu13

      - cp -r ../build/* .

      - cp -r ../build/* .

      - CXX=g++-13 F77=gfortran-13 ./configure

      - CXX=g++-13 F77=gfortran-13 ./configure

      - make clean

      - make wipe

      - make -j

      - make -j

      - echo "Running make with gnu compilers version 14..."

      - echo "Running make with gnu compilers version 14..."

      - cd ..

      - cd ..
@@ -75,7 +75,7 @@ compatibility_stage: 
      - cd build_gnu14

      - cd build_gnu14

      - cp -r ../build/* .

      - cp -r ../build/* .

      - CXX=g++-14 F77=gfortran-14 ./configure

      - CXX=g++-14 F77=gfortran-14 ./configure

      - make clean

      - make wipe

      - make -j

      - make -j

      - echo "Running make with refinement with gnu compilers version 14..."

      - echo "Running make with refinement with gnu compilers version 14..."

      - cd ..

      - cd ..
@@ -84,7 +84,7 @@ compatibility_stage: 
      - cd build_gnu14_refine

      - cd build_gnu14_refine

      - cp -r ../build/* .

      - cp -r ../build/* .

      - CXX=g++-14 F77=gfortran-14 ./configure --enable-refinement

      - CXX=g++-14 F77=gfortran-14 ./configure --enable-refinement

      - make clean

      - make wipe

      - make -j

      - make -j

      - echo "Running make with flang version 16 and clang version 16..."

      - echo "Running make with flang version 16 and clang version 16..."

      - cd ..

      - cd ..
@@ -92,8 +92,8 @@ compatibility_stage: 
      - mkdir build_clang16

      - mkdir build_clang16

      - cd build_clang16

      - cd build_clang16

      - cp -r ../build/* .

      - cp -r ../build/* .

      - CXX=clang++-16 F77=flang-new-16 ./configure --with-fflags="-O3" --with-include="-I/usr/include/c++/13 -I/usr/include/x86_64-linux-gnu/c++/13" --with-ldflags="-L/usr/lib/llvm-16/lib -L/usr/lib/gcc/x86_64-linux-gnu/13" --disable-openmp

      - CXX=clang++-16 F77=flang-new-16 ./configure --with-fflags="-O3 -std=legacy" --with-include="-I/usr/include/c++/13 -I/usr/include/x86_64-linux-gnu/c++/13" --with-ldflags="-L/usr/lib/llvm-16/lib -L/usr/lib/gcc/x86_64-linux-gnu/13" --disable-openmp

      - make clean

      - make wipe

      - make -j

      - make -j

      - echo "Running make with flang version 17 and clang version 17..."

      - echo "Running make with flang version 17 and clang version 17..."

      - cd ..

      - cd ..
@@ -101,8 +101,8 @@ compatibility_stage: 
      - mkdir build_clang17

      - mkdir build_clang17

      - cd build_clang17

      - cd build_clang17

      - cp -r ../build/* .

      - cp -r ../build/* .

      - CXX=clang++-17 F77=flang-new-17 ./configure --with-fflags="-O3" --with-include="-I/usr/include/c++/13 -I/usr/include/x86_64-linux-gnu/c++/13" --with-ldflags="-L/usr/lib/llvm-17/lib -L/usr/lib/gcc/x86_64-linux-gnu/13"  --disable-openmp

      - CXX=clang++-17 F77=flang-new-17 ./configure --with-fflags="-O3 -std=legacy" --with-include="-I/usr/include/c++/13 -I/usr/include/x86_64-linux-gnu/c++/13" --with-ldflags="-L/usr/lib/llvm-17/lib -L/usr/lib/gcc/x86_64-linux-gnu/13"  --disable-openmp

      - make clean

      - make wipe

      - make -j

      - make -j

      #- echo "Running make with Intel ifort and Intel icpx..."

      #- echo "Running make with Intel ifort and Intel icpx..."

      - cd ..

      - cd ..
@@ -113,7 +113,7 @@ compatibility_stage: 
      #- export LD_LIBRARY_PATH=/opt/intel/oneapi/compiler/latest/lib

      #- export LD_LIBRARY_PATH=/opt/intel/oneapi/compiler/latest/lib

      #- export PATH=/opt/intel/oneapi/compiler/latest/bin:$PATH

      #- export PATH=/opt/intel/oneapi/compiler/latest/bin:$PATH

      #- CXX=icpx F77=ifort ./configure --with-fflags="-O3 -diag-disable=10448" --disable-openmp

      #- CXX=icpx F77=ifort ./configure --with-fflags="-O3 -diag-disable=10448" --disable-openmp

      #- make clean

      #- make wipe

      #- make -j

      #- make -j

      - echo "Running make with Intel ifx and Intel icpx..."

      - echo "Running make with Intel ifx and Intel icpx..."

      #- cd ..

      #- cd ..
@@ -123,8 +123,8 @@ compatibility_stage: 
      - cp -r ../build/* .

      - cp -r ../build/* .

      - export LD_LIBRARY_PATH=/opt/intel/oneapi/compiler/latest/lib

      - export LD_LIBRARY_PATH=/opt/intel/oneapi/compiler/latest/lib

      - export PATH=/opt/intel/oneapi/compiler/latest/bin:$PATH

      - export PATH=/opt/intel/oneapi/compiler/latest/bin:$PATH

      - CXX=icpx F77=ifx ./configure --with-fflags="-O3" --disable-openmp

      - CXX=icpx F77=ifx ./configure --with-fflags="-O3 -std=legacy" --disable-openmp

      - make clean

      - make wipe

      - make -j

      - make -j

   

   

building_stage:

building_stage:
@@ -155,7 +155,7 @@ building_stage: 
      - cd build

      - cd build

      - echo "Configuring with default compilers (MAGMA disabled)..."

      - echo "Configuring with default compilers (MAGMA disabled)..."

      - ./configure --without-magma --without-cublas --disable-offload --enable-refinement

      - ./configure --without-magma --without-cublas --disable-offload --enable-refinement

      - make clean

      - make wipe

      - echo "Building the default configuration..."

      - echo "Building the default configuration..."

      - make -j

      - make -j

      - echo "Building the documentation..."

      - echo "Building the documentation..."

build/Makefile

0 → 100644
+148 −0
Original line number Original line Diff line number Diff line 
include Makefile.in



ifeq ($(BUILDFORTRAN), yes)

	FORTRAN_OBJS=../src/cluster/clu.o ../src/cluster/edfb_clu.o ../src/inclusion/edfb_inclu.o ../src/inclusion/inclu.o ../src/sphere/edfb_sph.o ../src/sphere/sph.o ../src/trapping/frfme.o ../src/trapping/lffft.o

	FORTRAN_BINS=cluster/clu cluster/edfb_clu inclusion/edfb_inclu inclusion/inclu sphere/edfb_sph sphere/sph trapping/frfme trapping/lffft

else

	FORTRAN_OBJS=

	FORTRAN_BINS=

endif # BUILDFORTRAN

ifeq ($(LIBMODE), shared)

	NPTM_LIB=libnptm/libnptm.so

	CXXFLAGSLIB=-fPIC -DPIC

else

	NPTM_LIB=libnptm/libnptm.a

	CXXFLAGSLIB=-static

endif # LIBMODE

NP_LIBNPTM_SRCS=../src/libnptm/algebraic.cpp ../src/libnptm/clu_subs.cpp ../src/libnptm/Commons.cpp ../src/libnptm/Configuration.cpp ../src/libnptm/cublas_calls.cpp ../src/libnptm/file_io.cpp ../src/libnptm/inclu_subs.cpp ../src/libnptm/logging.cpp ../src/libnptm/lapack_calls.cpp ../src/libnptm/magma_calls.cpp ../src/libnptm/Parsers.cpp ../src/libnptm/sph_subs.cpp ../src/libnptm/tfrfme.cpp ../src/libnptm/tra_subs.cpp ../src/libnptm/TransitionMatrix.cpp ../src/libnptm/utils.cpp

NP_LIBNPTM_OBJS=../src/libnptm/algebraic.o ../src/libnptm/clu_subs.o ../src/libnptm/Commons.o ../src/libnptm/Configuration.o ../src/libnptm/cublas_calls.o ../src/libnptm/file_io.o ../src/libnptm/inclu_subs.o ../src/libnptm/logging.o ../src/libnptm/lapack_calls.o ../src/libnptm/magma_calls.o ../src/libnptm/Parsers.o ../src/libnptm/sph_subs.o ../src/libnptm/tfrfme.o ../src/libnptm/tra_subs.o ../src/libnptm/TransitionMatrix.o ../src/libnptm/utils.o

NP_CLUSTER_OBJS=../src/cluster/np_cluster.o ../src/cluster/cluster.o

NP_CLUSTER_BINS=cluster/np_cluster

NP_INCLUSION_OBJS=../src/inclusion/np_inclusion.o ../src/inclusion/inclusion.o

NP_INCLUSION_BINS=inclusion/np_inclusion

NP_SPHERE_OBJS=../src/sphere/np_sphere.o ../src/sphere/sphere.o

NP_SPHERE_BINS=sphere/np_sphere

NP_TRAPPING_OBJS=../src/trapping/np_trapping.o ../src/trapping/cfrfme.o ../src/trapping/clffft.o

NP_TRAPPING_BINS=trapping/np_trapping

NP_TESTING_OBJS=../src/testing/test_ParticleDescriptor.o ../src/testing/test_TEDF.o ../src/testing/test_TTMS.o

NP_TESTING_BINS=testing/test_ParticleDescriptor testing/test_TEDF testing/test_TTMS



all: $(NPTM_LIB) $(FORTRAN_BINS) $(NP_CLUSTER_BINS) $(NP_INCLUSION_BINS) $(NP_SPHERE_BINS) $(NP_TRAPPING_BINS) $(NP_TESTING_BINS)



libnptm/libnptm.a: $(NP_LIBNPTM_OBJS)

	$(AR) $(ARFLAGS) $@ $(NP_LIBNPTM_OBJS)



libnptm/libnptm.so: $(NP_LIBNPTM_OBJS)

	$(CXX) $(CXXFLAGS) $(NP_LIBNPTM_OBJS) -shared -o $@ $(CXXLDFLAGS)

	chmod ugo-x $@



cluster/clu: ../src/cluster/clu.o

	$(FC) $(FCFLAGS) $? -o $@



cluster/edfb_clu: ../src/cluster/edfb_clu.o

	$(FC) $(FCFLAGS) $? -o $@



cluster/np_cluster: $(NPTM_LIB) $(NP_CLUSTER_OBJS)

	$(CXX) $(CXXFLAGS) $(NP_CLUSTER_OBJS) -o $@ $(CXXLDFLAGS)



inclusion/edfb_inclu: ../src/inclusion/edfb_inclu.o

	$(FC) $(FCFLAGS) $? -o $@



inclusion/inclu: ../src/inclusion/inclu.o

	$(FC) $(FCFLAGS) $? -o $@



inclusion/np_inclusion: $(NPTM_LIB) $(NP_INCLUSION_OBJS)

	$(CXX) $(CXXFLAGS) $(NP_INCLUSION_OBJS) -o $@ $(CXXLDFLAGS)



sphere/edfb_sph: ../src/sphere/edfb_sph.o

	$(FC) $(FCFLAGS) $? -o $@



sphere/sph: ../src/sphere/sph.o

	$(FC) $(FCFLAGS) $? -o $@



sphere/np_sphere: $(NPTM_LIB) $(NP_SPHERE_OBJS)

	$(CXX) $(CXXFLAGS) $(NP_SPHERE_OBJS) -o $@ $(CXXLDFLAGS)



trapping/frfme: ../src/trapping/frfme.o

	$(FC) $(FCFLAGS) $? -o $@



trapping/lffft: ../src/trapping/lffft.o

	$(FC) $(FCFLAGS) $? -o $@



trapping/np_trapping: $(NPTM_LIB) $(NP_TRAPPING_OBJS)

	$(CXX) $(CXXFLAGS) $(NP_TRAPPING_OBJS) -o $@ $(CXXLDFLAGS)



testing/test_ParticleDescriptor: $(NPTM_LIB) ../src/testing/test_ParticleDescriptor.o

	$(CXX) $(CXXFLAGS) ../src/testing/test_ParticleDescriptor.o -o $@ $(CXXLDFLAGS)



testing/test_TEDF: $(NPTM_LIB) ../src/testing/test_TEDF.o

	$(CXX) $(CXXFLAGS) ../src/testing/test_TEDF.o -o $@ $(CXXLDFLAGS)



testing/test_TTMS: $(NPTM_LIB) ../src/testing/test_TTMS.o

	$(CXX) $(CXXFLAGS) ../src/testing/test_TTMS.o -o $@ $(CXXLDFLAGS)



../src/cluster/clu.o: ../src/cluster/clu.f

	$(FC) $(FCFLAGS) -c $? -o $@



../src/cluster/edfb_clu.o: ../src/cluster/edfb_clu.f

	$(FC) $(FCFLAGS) -c $? -o $@



../src/cluster/np_cluster.o: ../src/cluster/np_cluster.cpp

	$(CXX) $(CXXFLAGS) -c $< -o $@



../src/cluster/cluster.o: ../src/cluster/cluster.cpp

	$(CXX) $(CXXFLAGS) -c $< -o $@



../src/inclusion/edfb_inclu.o: ../src/inclusion/edfb_inclu.f

	$(FC) $(FCFLAGS) -c $? -o $@



../src/inclusion/inclu.o: ../src/inclusion/inclu.f

	$(FC) $(FCFLAGS) -c $? -o $@



../src/inclusion/np_inclusion.o: ../src/inclusion/np_inclusion.cpp

	$(CXX) $(CXXFLAGS) -c $< -o $@



../src/inclusion/inclusion.o: ../src/inclusion/inclusion.cpp

	$(CXX) $(CXXFLAGS) -c $< -o $@



../src/sphere/edfb_sph.o: ../src/sphere/edfb_sph.f

	$(FC) $(FCFLAGS) -c $? -o $@



../src/sphere/sph.o: ../src/sphere/sph.f

	$(FC) $(FCFLAGS) -c $? -o $@



../src/sphere/np_sphere.o: ../src/sphere/np_sphere.cpp

	$(CXX) $(CXXFLAGS) -c $< -o $@



../src/sphere/sphere.o: ../src/sphere/sphere.cpp

	$(CXX) $(CXXFLAGS) -c $< -o $@



../src/trapping/frfme.o: ../src/trapping/frfme.f

	$(FC) $(FCFLAGS) -c $? -o $@



../src/trapping/lffft.o: ../src/trapping/lffft.f

	$(FC) $(FCFLAGS) -c $? -o $@



../src/trapping/np_trapping.o: ../src/trapping/np_trapping.cpp

	$(CXX) $(CXXFLAGS) -c $< -o $@



../src/trapping/cfrfme.o: ../src/trapping/cfrfme.cpp

	$(CXX) $(CXXFLAGS) -c $< -o $@



../src/trapping/clffft.o: ../src/trapping/clffft.cpp

	$(CXX) $(CXXFLAGS) -c $< -o $@



../src/libnptm/%.o: ../src/libnptm/%.cpp

	$(CXX) $(CXXFLAGS) $(CXXFLAGSLIB) -c $< -o $@



../src/testing/%.o: ../src/testing/%.cpp

	$(CXX) $(CXXFLAGS) -c $< -o $@



.PHONY: clean wipe



clean:

	rm -rf $(FORTRAN_OBJS) $(NP_LIBNPTM_OBJS) $(NP_CLUSTER_OBJS) $(NP_INCLUSION_OBJS) $(NP_SPHERE_OBJS) $(NP_TRAPPING_OBJS) $(NP_TESTING_OBJS)



wipe:

	rm -rf $(FORTRAN_OBJS) $(NP_LIBNPTM_OBJS) $(NP_CLUSTER_OBJS) $(NP_INCLUSION_OBJS) $(NP_SPHERE_OBJS) $(NP_TRAPPING_OBJS) $(NP_TESTING_OBJS)

	rm -rf $(FORTRAN_BINS) $(NPTM_LIB) $(NP_CLUSTER_BINS) $(NP_INCLUSION_BINS) $(NP_SPHERE_BINS) $(NP_TRAPPING_BINS) $(NP_TESTING_BINS)

build/Makefile.am→build/Makefile_am.bak

+0 −0

File moved.

View file

build/Makefile.in→build/Makefile_in.bak

+0 −0

File moved.

View file