From 58b4868e8962b61a326ca8fb738caf3918d19eea Mon Sep 17 00:00:00 2001 From: Valentin Churavy Date: Wed, 19 Jun 2024 16:16:11 -0400 Subject: [PATCH] Fix locate/set_library! (#40) --- .github/workflows/CI.yml | 4 +++- Project.toml | 4 ++-- src/api.jl | 1 + test/runtests.jl | 6 +++--- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 2c8546f..34ba84f 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -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 diff --git a/Project.toml b/Project.toml index 20cac21..b2cb723 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "LAMMPS" uuid = "ee2e13b9-eee9-4449-aafa-cfa6a2dbe14d" authors = ["Valentin Churavy "] -version = "0.3.0" +version = "0.3.1" [deps] CEnum = "fa961155-64e5-5f13-b03f-caf6b980ea82" @@ -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" diff --git a/src/api.jl b/src/api.jl index 578439b..d40d62c 100644 --- a/src/api.jl +++ b/src/api.jl @@ -2,6 +2,7 @@ module API using CEnum +import LAMMPS_jll import LAMMPS_jll: liblammps import MPI: MPI_Comm diff --git a/test/runtests.jl b/test/runtests.jl index 73b319a..061cc69 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -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 @@ -39,6 +41,4 @@ 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))