Browse Source

julia: use generic shell script for any julia application

Nathalie Furmento 5 years ago
parent
commit
21450012ab
3 changed files with 10 additions and 8 deletions
  1. 2 2
      configure.ac
  2. 8 6
      julia/examples/mult/mult_starpu.sh.in
  3. 0 0
      julia/examples/mult/Makefile.old

+ 2 - 2
configure.ac

@@ -3519,7 +3519,7 @@ AC_CONFIG_COMMANDS([executable-scripts], [
   test -e tools/starpu_paje_state_stats.R || ln -sf $ac_abs_top_srcdir/tools/starpu_paje_state_stats.R tools/starpu_paje_state_stats.R
   test -e tools/starpu_trace_state_stats.py || ln -sf $ac_abs_top_srcdir/tools/starpu_trace_state_stats.py tools/starpu_trace_state_stats.py
   chmod +x tools/starpu_trace_state_stats.py
-  chmod +x julia/examples/mult/mult_starpu.sh
+  chmod +x julia/examples/execute.sh
 ])
 
 # Create links to ICD files in build/socl/vendors directory. SOCL will use this
@@ -3613,7 +3613,7 @@ AC_OUTPUT([
 	julia/src/Makefile
 	julia/src/dynamic_compiler/Makefile
 	julia/examples/Makefile
-	julia/examples/mult/mult_starpu.sh
+	julia/examples/execute.sh
 ])
 
 AC_MSG_NOTICE([

+ 8 - 6
julia/examples/mult/mult_starpu.sh.in

@@ -1,15 +1,17 @@
 #!@REALBASH@
 
+set -x
 export JULIA_LOAD_PATH=@STARPU_SRC_DIR@/julia/src:$JULIA_LOAD_PATH
 export STARPU_JULIA_LIB=@STARPU_BUILD_DIR@/julia/src/.libs/libstarpujulia-1.3.so
 export STARPU_JULIA_BUILD=@STARPU_BUILD_DIR@/julia
-dirfile=@STARPU_SRC_DIR@/julia/examples/mult/
-srcfile=mult.jl
-if test ! -f $dirfile/$srcfile
+srcdir=@STARPU_SRC_DIR@/julia/examples
+srcfile=$1
+if test ! -f $srcdir/$srcfile
 then
-    echo "Error. File $dirfile/$srcfile not found"
+    echo "Error. File $srcdir/$srcfile not found"
     exit 1
 fi
-cd $dirfile/
-@JULIA@ $srcfile julia_generatedc.dat
+shift
+cd $srcdir/$(dirname $srcfile)
+@JULIA@ $(basename $srcfile) $*
 

julia/examples/mult/Makefile → julia/examples/mult/Makefile.old