Commit 575d91a8 authored by Johannes Paul Blaschke's avatar Johannes Paul Blaschke
Browse files

use consistent style when dereferencing symbols

parent cbe0a148
......@@ -73,7 +73,7 @@ export MPI4PY_MPICC="$(which cc) --shared"
unset PYTHONSTARTUP
# Make sure Cray-FFTW get loaded first to avoid Conda's MKL
export LD_PRELOAD="\$FFTW_DIR/libfftw3.so"
export LD_PRELOAD="\${FFTW_DIR}/libfftw3.so"
export LEGION_USE_GASNET=${LEGION_USE_GASNET:-1}
export GASNET_CONDUIT=aries
......@@ -223,7 +223,7 @@ export MPI4PY_CC="$(which cc)"
export MPI4PY_MPICC="$(which cc) --shared"
# Make sure Cray-FFTW get loaded first to avoid Conda's MKL
export LD_PRELOAD="\$FFTW_DIR/libfftw3.so"
export LD_PRELOAD="\${FFTW_DIR}/libfftw3.so"
export LEGION_USE_GASNET=${LEGION_USE_GASNET:-1}
export GASNET_CONDUIT=${GASNET_CONDUIT:-ucx}
......@@ -242,37 +242,38 @@ export LEGION_DEBUG=0
export PYVER=3.8
export LEGION_INSTALL_DIR="${root_dir}/install"
pathappend \$LEGION_INSTALL_DIR/bin
ldpathappend \$LEGION_INSTALL_DIR/lib
pythonpathappend \$LEGION_INSTALL_DIR/lib/python\$PYVER/site-packages
pathappend \${LEGION_INSTALL_DIR}/bin
ldpathappend \${LEGION_INSTALL_DIR}/lib
pythonpathappend \${LEGION_INSTALL_DIR}/lib/python\${PYVER}/site-packages
export CONDA_ROOT="${root_dir}/conda"
export CONDA_ENV_DIR="\$CONDA_ROOT/envs/myenv"
export CONDA_ENV_DIR="\${CONDA_ROOT}/envs/myenv"
export LCLS2_DIR="${root_dir}/lcls2"
# settings for finufft
if [[ -z \${FFTW_INC+x} ]]; then
export FINUFFT_CFLAGS="-I\$CONDA_ENV_DIR/include"
export FINUFFT_CFLAGS="-I\${CONDA_ENV_DIR}/include"
else
export FINUFFT_CFLAGS="-I\$FFTW_INC -I\$CONDA_ENV_DIR/include"
export FINUFFT_CFLAGS="-I\$FFTW_INC -I\${CONDA_ENV_DIR}/include"
fi
if [[ -z \${FFTW_DIR+x} ]]; then
export FINUFFT_LDFLAGS="-L\$CONDA_ENV_DIR/lib"
export FINUFFT_LDFLAGS="-L\${CONDA_ENV_DIR}/lib"
else
export FINUFFT_LDFLAGS="-L\$FFTW_DIR -L\$CONDA_ENV_DIR/lib"
export FINUFFT_LDFLAGS="-L\$FFTW_DIR -L\${CONDA_ENV_DIR}/lib"
fi
#cufinufft library dir
export CUFINUFFT_DIR="${root_dir}/cufinufft/lib"
ldpathappend \$CUFINUFFT_DIR
pathappend \$LCLS2_DIR/install/bin
pythonpathappend \$LCLS2_DIR/install/lib/python\$PYVER/site-packages
pathappend \${LCLS2_DIR}/install/bin
pythonpathappend \${LCLS2_DIR}/install/lib/python\${PYVER}/site-packages
if [[ -d \$CONDA_ROOT ]]; then
source "\$CONDA_ROOT/etc/profile.d/conda.sh"
conda activate "\$CONDA_ENV_DIR"
source "\${CONDA_ROOT}/etc/profile.d/conda.sh"
conda activate "\${CONDA_ENV_DIR}"
fi
EOF
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment