Skip to content

Add adjust_PATH and adjust_LIBPATH to System mpiexec #556

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 15, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 0 additions & 28 deletions .drone.jsonnet

This file was deleted.

21 changes: 0 additions & 21 deletions .drone.yml

This file was deleted.

2 changes: 2 additions & 0 deletions .github/workflows/Documenter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,12 @@ on:
paths:
- 'docs/**'
- 'src/**'
- 'lib/**'
pull_request:
paths:
- 'docs/**'
- 'src/**'
- 'lib/**'

jobs:
docs-build:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ShellCheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
push:
branches:
- master
- release-*
tags: '*'
paths:
- 'bin/**'
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/UnitTests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,17 @@ on:
- 'deps/**'
- 'src/**'
- 'test/**'
- 'lib/**'
push:
branches:
- master
- release-*
paths:
- 'bin/**'
- 'deps/**'
- 'src/**'
- 'test/**'
- 'lib/**'

jobs:
test-default:
Expand Down
65 changes: 0 additions & 65 deletions .gitlab-ci.yml

This file was deleted.

4 changes: 2 additions & 2 deletions lib/MPIPreferences/src/MPIPreferences.jl
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ module System
using Preferences
const libmpi = @load_preference("libmpi")
const mpiexec_path = @load_preference("mpiexec")
mpiexec() = `$mpiexec_path`
mpiexec(f) = f(`$mpiexec_path`)
mpiexec(;adjust_PATH=true, adjust_LIBPATH=true) = `$mpiexec_path`
mpiexec(f;adjust_PATH=true, adjust_LIBPATH=true) = f(`$mpiexec_path`)
end

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