Feature/om pgpu (!2) · Merge requests · Claudio Gheller / HPC_Imaging

Conflict: This file was added both in the source and target branches, but with different contents. Ask someone with write access to resolve it.

Build/Makefile.Macosx

0 → 100644

+26 −0

Changes for Build/Makefile.Macosx: 26 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		CC = icc
		CXX = g++-11

		MPICC = mpicc
		MPIC++ = mpiCC

		FFTW_INCL= -I/usr/local/include
		FFTW_LIB= -L/usr/local/lib/

		GSL_INCL =
		GSL_LIBS =

		MPI_LIB =
		MPI_INCL= -I/home/taffoni/sw/Linux_x86_64/21.5/comm_libs/mpi/include
		HDF5_INCL =
		HDF5_LIB =

		OMP= -fopenmp

		NVCC = nvcc
		NVFLAGS = -arch=sm_70 -Xcompiler -mno-float128 -std=c++11
		NVLIB = -L/home/taffoni -lcudart -lcuda

		CFLAGS += -I. $(FFTW_INCL) $(GSL_INCL) $(MPI_INCL)

		OPTIMIZE = $(OMP) -O3

Conflict: This file was added both in the source and target branches, but with different contents. Ask someone with write access to resolve it.

0 → 100644

+30 −0

Changes for Build/Makefile.Magellanus: 30 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		CC = gcc-10
		CXX = g++-10

		MPICC = mpicc
		MPIC++ = mpiCC

		GSL_INCL = -I/home/taffoni/sw/include
		GSL_LIBS = -L/home/taffoni/sw/lib

		FFTW_INCL=
		FFTW_LIB= -lfftw3_mpi -lfftw3

		MPI_LIB =
		MPI_INCL=
		HDF5_INCL =
		HDF5_LIB =

		OMP = -fopenmp -lcuda -lcudart
		NVCC = nvcc
		NVFLAGS = -arch=sm_70 -Xcompiler -std=c++11
		NVLIB = -lcudart -lcuda


		CFLAGS += -I. $(FFTW_INCL) $(GSL_INCL) $(MPI_INCL)

		OPTIMIZE = $(OMP) -O3

		# OMP GPU SPECIFIC FLAGS
		OPTIMIZE += -Wno-unused-result -foffload=-lm -ffast-math
		OPTIMIZE += -fcf-protection=none -fno-stack-protector -foffload=nvptx-none -foffload=-misa=sm_35

0 → 100644

+26 −0

Changes for Build/Makefile.MagellanusNVC: 26 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		CC = nvc
		CXX = nvc++

		MPICC = mpicc
		MPIC++ = mpiCC

		GSL_INCL = -I/home/taffoni/sw/include
		GSL_LIBS = -L/home/taffoni/sw/lib

		FFTW_INCL= -I/home/taffoni/sw/include
		FFTW_LIB= -L/home/taffoni/sw/lib -lfftw3_mpi -lfftw3

		MPI_LIB =
		MPI_INCL= -I/home/taffoni/sw/Linux_x86_64/21.5/comm_libs/mpi/include
		HDF5_INCL =
		HDF5_LIB =

		OMP = -mp=multicore,gpu -Mprof -cuda -lcudart
		NVCC = nvcc
		NVFLAGS = -arch=sm_70 -Xcompiler -std=c++11
		NVLIB = -L/home/taffoni/sw/Linux_x86_64/21.5/cuda/11.3/lib64/ -lcudart -lcuda


		CFLAGS += -I. $(FFTW_INCL) $(GSL_INCL) $(MPI_INCL)

		OPTIMIZE = $(OMP) -O3

Conflict: This file was added both in the source and target branches, but with different contents. Ask someone with write access to resolve it.

0 → 100644

+20 −0

Changes for Build/Makefile.Marconi: 20 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		CC = gcc
		CXX = g++

		MPICC = mpicc
		MPIC++ = mpiCC


		FFTW_INCL= -I/home/taffoni/sw/include
		FFTW_LIB= -L/home/taffoni/sw/lib


		NVCC = nvcc
		NVFLAGS = -arch=sm_70 -Xcompiler -mno-float128 -std=c++11
		NVLIB = -L/cineca/prod/opt/compilers/cuda/10.1/none/lib64/ -lcudart -lcuda

		OMP= -fopenmp

		CFLAGS += -I. $(FFTW_INCL) $(GSL_INCL) $(MPI_INCL)

		OPTIMIZE = $(OMP) -O3 -mtune=native

0 → 100644

+24 −0