diff --git a/.gitmodules b/.gitmodules index f67d92e0d1..cd6128fa73 100644 --- a/.gitmodules +++ b/.gitmodules @@ -5,5 +5,5 @@ path = validation/advanced-tests/data url = https://code.jlab.org/hallb/clas12/coatjava/advanced-tests [submodule "etc/nnet"] - path = etc/nnet + path = etc/data/nnet url = https://code.jlab.org/hallb/clas12/coatjava/networks diff --git a/build-coatjava.sh b/build-coatjava.sh index a415eb2ffa..d2c031f82d 100755 --- a/build-coatjava.sh +++ b/build-coatjava.sh @@ -110,7 +110,7 @@ download () { cd $src_dir > /dev/null git lfs install git submodule update --init etc/data/magfield - git submodule update --init etc/nnet + git submodule update --init etc/data/nnet if $downloadData; then git submodule update --init validation/advanced-tests/data; fi cd - > /dev/null else diff --git a/etc/data/nnet b/etc/data/nnet new file mode 160000 index 0000000000..26318bd719 --- /dev/null +++ b/etc/data/nnet @@ -0,0 +1 @@ +Subproject commit 26318bd719e4f25d7361e4d17c6dba7642c8e4f5 diff --git a/etc/ejml/ejmlclas12.network b/etc/ejml/ejmlclas12.network deleted file mode 100644 index 9c0a9b50c3..0000000000 Binary files a/etc/ejml/ejmlclas12.network and /dev/null differ diff --git a/etc/nnet b/etc/nnet deleted file mode 160000 index 0b52d7ddab..0000000000 --- a/etc/nnet +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0b52d7ddab9eabda3634b4e2f28371ca4cd5595e diff --git a/reconstruction/ai/src/main/java/org/jlab/service/ai/DCDenoiseEngine.java b/reconstruction/ai/src/main/java/org/jlab/service/ai/DCDenoiseEngine.java index cee3b2daad..8187762bad 100644 --- a/reconstruction/ai/src/main/java/org/jlab/service/ai/DCDenoiseEngine.java +++ b/reconstruction/ai/src/main/java/org/jlab/service/ai/DCDenoiseEngine.java @@ -65,7 +65,7 @@ public boolean init() { try { criteria = Criteria.builder() .setTypes(float[][].class, float[][].class) - .optModelPath(Paths.get(ClasUtilsFile.getResourceDir("CLAS12DIR","etc/nnet/dn/cnn_autoenc_sector1_nBlocks2.pt"))) + .optModelPath(Paths.get(ClasUtilsFile.getResourceDir("CLAS12DIR","etc/data/nnet/dn/cnn_autoenc_sector1_nBlocks2.pt"))) .optEngine("PyTorch") .optTranslator(DCDenoiseEngine.getTranslator()) .optProgress(new ProgressBar()) diff --git a/reconstruction/alert/src/main/java/org/jlab/rec/ahdc/AI/Model.java b/reconstruction/alert/src/main/java/org/jlab/rec/ahdc/AI/Model.java index 83813a8561..33b1575f77 100644 --- a/reconstruction/alert/src/main/java/org/jlab/rec/ahdc/AI/Model.java +++ b/reconstruction/alert/src/main/java/org/jlab/rec/ahdc/AI/Model.java @@ -43,7 +43,7 @@ public NDList processInput(TranslatorContext translatorContext, float[] floats) System.setProperty("ai.djl.pytorch.num_threads", "1"); System.setProperty("ai.djl.pytorch.graph_optimizer", "false"); - String path = CLASResources.getResourcePath("etc/nnet/ALERT/model_AHDC/"); + String path = CLASResources.getResourcePath("etc/data/nnet/ALERT/model_AHDC/"); Criteria my_model = Criteria.builder().setTypes(float[].class, Float.class) .optModelPath(Paths.get(path)) .optEngine("PyTorch") diff --git a/reconstruction/mltn/src/main/java/org/jlab/service/mltn/MLTDEngine.java b/reconstruction/mltn/src/main/java/org/jlab/service/mltn/MLTDEngine.java index 21cbf1c358..e7bcac7fe4 100644 --- a/reconstruction/mltn/src/main/java/org/jlab/service/mltn/MLTDEngine.java +++ b/reconstruction/mltn/src/main/java/org/jlab/service/mltn/MLTDEngine.java @@ -45,7 +45,7 @@ public boolean init() { String runNumber = Optional.ofNullable(this.getEngineConfigString("run")).orElse("5038"); networkRun = Integer.parseInt(runNumber); - String path = CLASResources.getResourcePath("etc/ejml/ejmlclas12.network"); + String path = CLASResources.getResourcePath("etc/data/nnet/ejml/ejmlclas12.network"); if(this.getEngineConfigString("network")!=null) path = this.getEngineConfigString("network"); System.out.println("[neural-network] info : Loading neural network from " + path); diff --git a/reconstruction/mltn/src/main/java/org/jlab/service/mltn/MLTNEngine.java b/reconstruction/mltn/src/main/java/org/jlab/service/mltn/MLTNEngine.java index 2181fd561e..f4e8790dfe 100644 --- a/reconstruction/mltn/src/main/java/org/jlab/service/mltn/MLTNEngine.java +++ b/reconstruction/mltn/src/main/java/org/jlab/service/mltn/MLTNEngine.java @@ -29,7 +29,7 @@ public MLTNEngine(){ @Override public boolean init() { classifier.setEnvDirectory("CLAS12DIR"); - classifier.setEnvPath("etc/nnet/neuroph"); + classifier.setEnvPath("etc/data/nnet/neuroph"); classifier.load("trackClassifier.nnet", "trackFixer.nnet"); System.out.println("Loading neural network files done..."); //throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.