Merge pull request #223 from ChevronETC/wask/install-devitopro-sh

Use install-devitopro-sh

Author: jkwashbourne-oss

Project.toml

@@ -1,7 +1,7 @@
 name = "Devito"
 uuid = "06ed14b1-0e40-4084-abdf-764a285f8c42"
 authors = ["Sam Kaplan <Sam.Kaplan@chevron.com>"]
-version = "1.2.1"
+version = "1.3.0"
 
 [deps]
 PyCall = "438e738f-606a-5dbb-bf0a-cddfbfd45ab0"

deps/build.jl

@@ -71,13 +71,27 @@ 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