Skip to content

Commit a8f0cc3

Browse files
authored
Merge pull request #556 from JuliaParallel/sb/adjust-path
Add adjust_PATH and adjust_LIBPATH to System mpiexec
2 parents 756ee25 + 26144c7 commit a8f0cc3

File tree

7 files changed

+8
-116
lines changed

7 files changed

+8
-116
lines changed

.drone.jsonnet

Lines changed: 0 additions & 28 deletions
This file was deleted.

.drone.yml

Lines changed: 0 additions & 21 deletions
This file was deleted.

.github/workflows/Documenter.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,12 @@ on:
88
paths:
99
- 'docs/**'
1010
- 'src/**'
11+
- 'lib/**'
1112
pull_request:
1213
paths:
1314
- 'docs/**'
1415
- 'src/**'
16+
- 'lib/**'
1517

1618
jobs:
1719
docs-build:

.github/workflows/ShellCheck.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
push:
55
branches:
66
- master
7+
- release-*
78
tags: '*'
89
paths:
910
- 'bin/**'

.github/workflows/UnitTests.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,17 @@ on:
77
- 'deps/**'
88
- 'src/**'
99
- 'test/**'
10+
- 'lib/**'
1011
push:
1112
branches:
1213
- master
14+
- release-*
1315
paths:
1416
- 'bin/**'
1517
- 'deps/**'
1618
- 'src/**'
1719
- 'test/**'
20+
- 'lib/**'
1821

1922
jobs:
2023
test-default:

.gitlab-ci.yml

Lines changed: 0 additions & 65 deletions
This file was deleted.

lib/MPIPreferences/src/MPIPreferences.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ module System
2323
using Preferences
2424
const libmpi = @load_preference("libmpi")
2525
const mpiexec_path = @load_preference("mpiexec")
26-
mpiexec() = `$mpiexec_path`
27-
mpiexec(f) = f(`$mpiexec_path`)
26+
mpiexec(;adjust_PATH=true, adjust_LIBPATH=true) = `$mpiexec_path`
27+
mpiexec(f;adjust_PATH=true, adjust_LIBPATH=true) = f(`$mpiexec_path`)
2828
end
2929

3030
function use_jll_binary(binary = Sys.iswindows() ? "MicrosoftMPI_jll" : "MPICH_jll";export_prefs=false, force=true)

0 commit comments

Comments
 (0)