Skip to content

Cleanup network paths #974

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
baltzell merged 5 commits into from
Dec 2, 2025
Merged

Cleanup network paths #974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c8901b0
rename, remove another network
baltzell Dec 2, 2025
4dea755
use new network location
baltzell Dec 2, 2025
b9858d6
new network location
baltzell Dec 2, 2025
a5508c0
update to latest networks
baltzell Dec 2, 2025
46c716b
bugfix, new path
baltzell Dec 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion build-coatjava.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions etc/data/nnet
Open in desktop
Submodule nnet added at 26318b
Binary file removed etc/ejml/ejmlclas12.network
View file
Open in desktop
Binary file not shown.
1 change: 0 additions & 1 deletion etc/nnet
Open in desktop
Submodule nnet deleted from 0b52d7
2 changes: 1 addition & 1 deletion reconstruction/ai/src/main/java/org/jlab/service/ai/DCDenoiseEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
2 changes: 1 addition & 1 deletion reconstruction/alert/src/main/java/org/jlab/rec/ahdc/AI/Model.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<float[], Float> my_model = Criteria.builder().setTypes(float[].class, Float.class)
.optModelPath(Paths.get(path))
.optEngine("PyTorch")
Expand Down
2 changes: 1 addition & 1 deletion reconstruction/mltn/src/main/java/org/jlab/service/mltn/MLTDEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion reconstruction/mltn/src/main/java/org/jlab/service/mltn/MLTNEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Loading