Brutex
/
cavis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Using embedded copying of an array instead of manual (#9073) 

Signed-off-by: Dariusz Zbyrad <dariusz.zbyrad@gmail.com>
master
dariuszzbyrad 2020-08-27 02:12:40 +02:00 committed by GitHub
parent 4394965cb5
commit 8ff0aa8ddf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
datavec/datavec-python/src/main/java/org/datavec/python/PythonExecutioner.java
View File

@ -345,10 +345,7 @@ public class PythonExecutioner {
//// TODO: fix in javacpp //// TODO: fix in javacpp
File sitePackagesWindows = new File(python.cachePackage(), "site-packages"); File sitePackagesWindows = new File(python.cachePackage(), "site-packages");
File[] packages2 = new File[packages.length + 1]; File[] packages2 = new File[packages.length + 1];
for (int i = 0;i < packages.length; i++){ System.arraycopy(packages, 0, packages2, 0, packages.length);
//System.out.println(packages[i].getAbsolutePath());
packages2[i] = packages[i];
}
packages2[packages.length] = sitePackagesWindows; packages2[packages.length] = sitePackagesWindows;
//System.out.println(sitePackagesWindows.getAbsolutePath()); //System.out.println(sitePackagesWindows.getAbsolutePath());
packages = packages2; packages = packages2;

8
datavec/datavec-python/src/main/java/org/datavec/python/PythonProcess.java
View File

@ -30,9 +30,7 @@ public class PythonProcess {
private static String pythonExecutable = Loader.load(org.bytedeco.cpython.python.class); private static String pythonExecutable = Loader.load(org.bytedeco.cpython.python.class);
public static String runAndReturn(String... arguments)throws IOException, InterruptedException{ public static String runAndReturn(String... arguments)throws IOException, InterruptedException{
String[] allArgs = new String[arguments.length + 1]; String[] allArgs = new String[arguments.length + 1];
for (int i = 0; i < arguments.length; i++){ System.arraycopy(arguments, 0, allArgs, 1, arguments.length);
allArgs[i + 1] = arguments[i];
}
allArgs[0] = pythonExecutable; allArgs[0] = pythonExecutable;
log.info("Executing command: " + Arrays.toString(allArgs)); log.info("Executing command: " + Arrays.toString(allArgs));
ProcessBuilder pb = new ProcessBuilder(allArgs); ProcessBuilder pb = new ProcessBuilder(allArgs);
@ -45,9 +43,7 @@ public class PythonProcess {
public static void run(String... arguments)throws IOException, InterruptedException{ public static void run(String... arguments)throws IOException, InterruptedException{
String[] allArgs = new String[arguments.length + 1]; String[] allArgs = new String[arguments.length + 1];
for (int i = 0; i < arguments.length; i++){ System.arraycopy(arguments, 0, allArgs, 1, arguments.length);
allArgs[i + 1] = arguments[i];
}
allArgs[0] = pythonExecutable; allArgs[0] = pythonExecutable;
log.info("Executing command: " + Arrays.toString(allArgs)); log.info("Executing command: " + Arrays.toString(allArgs));
ProcessBuilder pb = new ProcessBuilder(allArgs); ProcessBuilder pb = new ProcessBuilder(allArgs);