From 569d13775f3acef600cb6ce3d4c808bf30696d46 Mon Sep 17 00:00:00 2001 From: jwashbourne Date: Tue, 4 Nov 2025 17:03:16 +0000 Subject: [PATCH 1/2] Use install-devitopro-sh --- Project.toml | 2 +- deps/build.jl | 27 +++++++++++++++++++++------ 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/Project.toml b/Project.toml index 7368237..9175e3c 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "Devito" uuid = "06ed14b1-0e40-4084-abdf-764a285f8c42" authors = ["Sam Kaplan "] -version = "1.2.1" +version = "1.3.0" [deps] PyCall = "438e738f-606a-5dbb-bf0a-cddfbfd45ab0" diff --git a/deps/build.jl b/deps/build.jl index 1f299d0..9be132b 100644 --- a/deps/build.jl +++ b/deps/build.jl @@ -71,13 +71,28 @@ try cd(dir) - # Install devito[extras,tests] - @info("Install devito[extras,tests]") - pip("$(dir)/submodules/devito[extras,tests]") + # Run install-devitopro.sh + @info("running install-devitopro.sh") - # Install devitopro - @info("Install devitopro[extras]") - pip("$(dir)[extras]") + cmd_args = String["install-devitopro.sh"] + run(Cmd(cmd_args)) + + + # # Install devito[extras,tests] + # @info("Install devito[extras,tests]") + # pip("$(dir)/submodules/devito[extras,tests]") + + # # Install devitopro + # @info("Install devitopro[extras]") + # pip("$(dir)[extras]") + + # # Install devito + # @info("Install devito") + # pip("$(dir)/submodules/devito") + + # # Install devitopro + # @info("Install devitopro") + # pip(dir) # Now all we need is mpi4py. It is straightforward to install except with the nvidia compiler that requires # extra flags to ignore some flags set by mpi4py From fd10960f8174de184b4c1c7d0c58b097da032930 Mon Sep 17 00:00:00 2001 From: jwashbourne Date: Tue, 4 Nov 2025 17:15:18 +0000 Subject: [PATCH 2/2] make install-devitopro.sh path relative --- deps/build.jl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/deps/build.jl b/deps/build.jl index 9be132b..0c8953d 100644 --- a/deps/build.jl +++ b/deps/build.jl @@ -74,10 +74,9 @@ try # Run install-devitopro.sh @info("running install-devitopro.sh") - cmd_args = String["install-devitopro.sh"] + cmd_args = String["./install-devitopro.sh"] run(Cmd(cmd_args)) - # # Install devito[extras,tests] # @info("Install devito[extras,tests]") # pip("$(dir)/submodules/devito[extras,tests]")