From 4c6cea2b5cc1aabe4d36b28f6cb07654205b4f47 Mon Sep 17 00:00:00 2001 From: monty Date: Mon, 17 Jul 2023 17:09:59 -0600 Subject: [PATCH] eachindex --- old/scripts/SVR1.jl | 2 -- old/scripts/SVR2.jl | 2 -- old/scripts/SVR_CSV_format.jl | 2 -- old/scripts/SVR_JLD_format.jl | 2 -- old/scripts/SVR_libsvm_format.jl | 2 -- old/tools/grid.jl | 6 +++--- 6 files changed, 3 insertions(+), 13 deletions(-) diff --git a/old/scripts/SVR1.jl b/old/scripts/SVR1.jl index c82a98b..e7c5f63 100644 --- a/old/scripts/SVR1.jl +++ b/old/scripts/SVR1.jl @@ -62,8 +62,6 @@ const RBF = Int32(2) const SIGMOID = Int32(3) const PRECOMPUTED = Int32(4) - - shell_path = pwd() this_folder_path = dirname(Base.source_path()) #println(shell_path) diff --git a/old/scripts/SVR2.jl b/old/scripts/SVR2.jl index 8d4b0a0..ca35ef8 100644 --- a/old/scripts/SVR2.jl +++ b/old/scripts/SVR2.jl @@ -60,8 +60,6 @@ const RBF = Int32(2) const SIGMOID = Int32(3) const PRECOMPUTED = Int32(4) - - shell_path = pwd() cd(dirname(Base.source_path())) const svmlib = abspath("../libsvm.so.2") diff --git a/old/scripts/SVR_CSV_format.jl b/old/scripts/SVR_CSV_format.jl index 199c568..d4c85b6 100644 --- a/old/scripts/SVR_CSV_format.jl +++ b/old/scripts/SVR_CSV_format.jl @@ -60,8 +60,6 @@ const RBF = Int32(2) const SIGMOID = Int32(3) const PRECOMPUTED = Int32(4) - - shell_path = pwd() cd(dirname(Base.source_path())) const svmlib = abspath("../libsvm.so.2") diff --git a/old/scripts/SVR_JLD_format.jl b/old/scripts/SVR_JLD_format.jl index c40db22..5bf96d4 100644 --- a/old/scripts/SVR_JLD_format.jl +++ b/old/scripts/SVR_JLD_format.jl @@ -60,8 +60,6 @@ const RBF = Int32(2) const SIGMOID = Int32(3) const PRECOMPUTED = Int32(4) - - shell_path = pwd() cd(dirname(Base.source_path())) const svmlib = abspath("../libsvm.so.2") diff --git a/old/scripts/SVR_libsvm_format.jl b/old/scripts/SVR_libsvm_format.jl index 10aa763..63dcea0 100644 --- a/old/scripts/SVR_libsvm_format.jl +++ b/old/scripts/SVR_libsvm_format.jl @@ -60,8 +60,6 @@ const RBF = Int32(2) const SIGMOID = Int32(3) const PRECOMPUTED = Int32(4) - - shell_path = pwd() cd(dirname(Base.source_path())) const svmlib = abspath("../libsvm.so.2") diff --git a/old/tools/grid.jl b/old/tools/grid.jl index b801dbc..e4589cb 100644 --- a/old/tools/grid.jl +++ b/old/tools/grid.jl @@ -1,13 +1,13 @@ -using PyCall +import PyCall path_to_use_for_grid = dirname(Base.source_path()) function grid(num_w, ssh_w, telnet_w, trialfile, options) trialfile = abspath(trialfile) options = split(options, " ") - unshift!(PyVector(pyimport("sys")["path"]), "") + unshift!(PyCall.PyVector(PyCall.pyimport("sys")["path"]), "") p = pwd() cd(path_to_use_for_grid) - @pyimport gridregressionjulia + @PyCall.pyimport gridregressionjulia gridregressionjulia.set_for_parallel(num_w, ssh_w, telnet_w) best_mse, best_param = gridregressionjulia.find_parameters(trialfile, options) cd(p)