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

Merge pull request #8526 from KonduitAI/master 

Merge
master
Alex Black 2019-12-12 18:20:40 +11:00 committed by GitHub
parent c0163f6e01 709295281e
commit 228d06fbb0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1112,7 +1112,7 @@ public class PythonExecutioner {
FileUtils.write(new File(dest), patch, "utf-8"); FileUtils.write(new File(dest), patch, "utf-8");
} }
catch(IOException e){ catch(IOException e){
throw new RuntimeException("Error reading resource."); log.warn("Error patching numpy: " + e);
} }
} }
@ -1120,12 +1120,12 @@ public class PythonExecutioner {
try { try {
return FileUtils.readFileToString(new File(dest), "utf-8").startsWith("#patch"); return FileUtils.readFileToString(new File(dest), "utf-8").startsWith("#patch");
} catch (IOException e) { } catch (IOException e) {
throw new RuntimeException("Error patching numpy"); return false;
} }
} }
private static void applyPatches() { private static void applyPatches() {
// We patch numpy for partial support of multiple interpreters
for (String[] patch : _getPatches()){ for (String[] patch : _getPatches()){
if (_checkPatchApplied(patch[1])){ if (_checkPatchApplied(patch[1])){
log.info("Patch already applied for " + patch[1]); log.info("Patch already applied for " + patch[1]);
@ -1137,7 +1137,7 @@ public class PythonExecutioner {
} }
for (String[] patch: _getPatches()){ for (String[] patch: _getPatches()){
if (!_checkPatchApplied(patch[1])){ if (!_checkPatchApplied(patch[1])){
throw new RuntimeException("Error patching numpy"); log.warn("Error patching numpy");
} }
} }
} }