Skip to content

Commit

Permalink
Merge branch 'main' into vc/fix_external
Browse files Browse the repository at this point in the history
  • Loading branch information
vchuravy authored Jun 20, 2024
2 parents 0f2ce91 + 7201aec commit c7fc6a4
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 5 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,15 @@ jobs:
test:
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
runs-on: ${{ matrix.os }}
continue-on-error: ${{ matrix.version == 'nightly' }}
strategy:
fail-fast: false
matrix:
version:
- "1.8"
- "1.9"
- "~1.10.0-0"
- "1.10"
- "~1.11.0-0"
- "nightly"
os:
- ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Preferences = "21216c6a-2e73-6563-6e65-726566657250"
MPI = "da04e1cc-30fd-572f-bb4f-1f8673147195"

[compat]
CEnum = "0.4"
CEnum = "0.4, 0.5"
LAMMPS_jll = "2.4"
Preferences = "1"
MPI = "0.20"
Expand Down
1 change: 1 addition & 0 deletions src/api.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ module API

using CEnum

import LAMMPS_jll
import LAMMPS_jll: liblammps
import MPI: MPI_Comm

Expand Down
6 changes: 3 additions & 3 deletions test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ using Test
using LAMMPS
using MPI

@test_logs (:warn,"LAMMPS library path changed, you will need to restart Julia for the change to take effect") LAMMPS.set_library!(LAMMPS.locate())

LMP() do lmp
@test LAMMPS.version(lmp) >= 0
end
Expand Down Expand Up @@ -49,9 +51,7 @@ end
end
end

MPI.mpiexec() do mpiexec
@test success(pipeline(`$mpiexec -n 2 $(Base.julia_cmd()) mpitest.jl`, stderr=stderr, stdout=stdout))
end
@test success(pipeline(`$(MPI.mpiexec()) -n 2 $(Base.julia_cmd()) mpitest.jl`, stderr=stderr, stdout=stdout))

LMP(["-screen", "none"]) do lmp
called = Ref(false)
Expand Down

0 comments on commit c7fc6a4

Please sign in to comment.