Skip to content

Commit 4e27040

Browse files
committed
Do not strip link path from builds.
1 parent d2e9dc1 commit 4e27040

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

conda/delta.sh

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
#!/bin/bash
22

33
#SBATCH --job-name="glotzerlab-software build"
4-
#SBATCH --account=bbgw-delta-gpu
5-
#SBATCH --partition=gpuA40x4
4+
#SBATCH --account=bbgw-delta-cpu
5+
#SBATCH --partition=cpu
66
#SBATCH --nodes=1
77
#SBATCH --tasks-per-node=1
88
#SBATCH --cpus-per-task=16
9-
#SBATCH --mem=48g
10-
#SBATCH --gpus=1
9+
#SBATCH --mem-per-cpu=2000M
1110
#SBATCH --time=8:00:00
1211

13-
# TODO: rewrite to use CPU account when it is renewed
1412
export OUTPUT_FOLDER=/projects/bbgw/software/conda
1513
unset CMAKE_PREFIX_PATH
1614

conda/hoomd/build_hoomd.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ if [[ $1 == "gpu" ]]; then
22
ENABLE_GPU="on"
33
fi
44

5+
# Use CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE to keep absolute links to mpi and other modules
56
cmake -B build \
67
${CMAKE_ARGS} \
78
-DENABLE_MPI=on \
@@ -11,6 +12,7 @@ cmake -B build \
1112
-DENABLE_TBB=off \
1213
-DENABLE_LLVM=off \
1314
-DPLUGINS="" \
15+
-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE \
1416
-DCMAKE_CXX_FLAGS=-march=native -DCMAKE_C_FLAGS=-march=native \
1517
-GNinja
1618

conda/hoomd/meta.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{% set name = "hoomd" %}
22
{% set version = "4.6.0" %}
3-
{% set build = 0 %}
3+
{% set build = 2 %}
44
{% set sha256 = "0002381abd82f4f5d152edb3ac319c184da3980a4bcd377e511d13ef70932c74" %}
55

66

@@ -14,6 +14,7 @@ source:
1414
sha256: {{ sha256 }}
1515

1616
build:
17+
binary_relocation: False
1718
script_env:
1819
- LD_LIBRARY_PATH
1920
- MPICC

conda/mpi4py/meta.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Adapted from: https://github.com/conda-forge/mpi4py-feedstock/blob/main/recipe/meta.yaml
22

3-
{% set version = "3.1.5" %}
3+
{% set version = "3.1.6" %}
44
{% set build = 0 %}
55

66
package:
@@ -10,9 +10,10 @@ package:
1010
source:
1111
- fn: mpi4py-{{ version }}.tar.gz
1212
url: https://github.com/mpi4py/mpi4py/releases/download/{{ version }}/mpi4py-{{ version }}.tar.gz
13-
sha256: a706e76db9255135c2fb5d1ef54cb4f7b0e4ad9e33cbada7de27626205f2a153
13+
sha256: c8fa625e0f92b082ef955bfb52f19fa6691d29273d7d71135d295aa143dee6cb
1414

1515
build:
16+
binary_relocation: False
1617
number: {{ build }}
1718
string: {{ cluster }}_py{{ py }}h{{ PKG_HASH }}_{{ build }}
1819
script_env:

0 commit comments

Comments
 (0)