diff --git a/Grid/simd/Simd.h b/Grid/simd/Simd.h index 428981fa..be60a99a 100644 --- a/Grid/simd/Simd.h +++ b/Grid/simd/Simd.h @@ -113,6 +113,14 @@ accelerator_inline RealD adj(const RealD & r){ return r; } accelerator_inline ComplexD adj(const ComplexD& r){ return(conjugate(r)); } accelerator_inline ComplexF adj(const ComplexF& r ){ return(conjugate(r)); } +#if defined(GRID_CUDA) || defined(GRID_HIP) +//Provide for convenience +accelerator_inline std::complex conjugate(const std::complex& r){ return(conj(r)); } +accelerator_inline std::complex conjugate(const std::complex& r) { return(conj(r)); } +accelerator_inline std::complex adj(const std::complex& r) { return(conj(r)); } +accelerator_inline std::complex adj(const std::complex& r) { return(conj(r)); } +#endif + accelerator_inline RealF real(const RealF & r){ return r; } accelerator_inline RealD real(const RealD & r){ return r; } accelerator_inline RealF real(const ComplexF & r){ return r.real(); } diff --git a/systems/Perlmutter/config-command b/systems/Perlmutter/config-command index 30b17b4e..730cb8c1 100644 --- a/systems/Perlmutter/config-command +++ b/systems/Perlmutter/config-command @@ -1,12 +1,12 @@ DIR=`pwd` -PREFIX=$HOME/DDHMC/Grid/systems/Prerequisites/install/ + ../../configure \ --enable-comms=mpi \ --enable-simd=GPU \ --enable-shm=nvlink \ --enable-gen-simd-width=64 \ - --with-gmp=$PREFIX \ - --with-mpfr=$PREFIX \ + --with-gmp=$GMP \ + --with-mpfr=$MPFR \ --enable-accelerator=cuda \ --disable-fermion-reps \ --disable-unified \ diff --git a/systems/Perlmutter/sourceme.sh b/systems/Perlmutter/sourceme.sh index 6d09b1c9..1e4d2de6 100644 --- a/systems/Perlmutter/sourceme.sh +++ b/systems/Perlmutter/sourceme.sh @@ -1,4 +1,6 @@ - export CRAY_ACCEL_TARGET=nvidia80 +source /global/homes/p/pboyle/spack/share/spack/setup-env.sh +export MPFR=`spack find --paths mpfr | grep mpfr | cut -c 13-` +export GMP=`spack find --paths gmp | grep gmp | cut -c 12-` -module load PrgEnv-gnu cpe-cuda cudatoolkit/11.4 +module load PrgEnv-gnu cpe-cuda cudatoolkit/12.0 diff --git a/systems/mac-arm/sourceme.sh b/systems/mac-arm/sourceme.sh index b20af490..34a725ab 100644 --- a/systems/mac-arm/sourceme.sh +++ b/systems/mac-arm/sourceme.sh @@ -1,11 +1,7 @@ source /Users/peterboyle/QCD//Spack/spack//share/spack/setup-env.sh export FFTW=`spack find --paths fftw | grep ^fftw | awk '{print $2}' ` -#export HDF5=`spack find --paths hdf5+cxx | grep ^hdf5 | awk '{print $2}' ` export CLIME=`spack find --paths c-lime | grep ^c-lime | awk '{print $2}' ` export MPFR=`spack find --paths mpfr | grep ^mpfr | awk '{print $2}' ` export OPENSSL=`spack find --paths openssl | grep openssl | awk '{print $2}' ` export GMP=`spack find --paths gmp | grep ^gmp | awk '{print $2}' ` -export LD_LIBRARY_PATH=$MPFR/lib:$LD_LIBRARY_PATH -export LD_LIBRARY_PATH=$GMP/lib:$LD_LIBRARY_PATH -