Temporary fix for a bug where multiple path_selectors do not work

RIKEN-RCCS · Apr 22, 2024 · cc4593a · cc4593a
1 parent 58b4fdd
commit cc4593a
Show file tree

Hide file tree

Showing 29 changed files with 170 additions and 35 deletions.
diff --git a/ABINIT_MP/form.js b/ABINIT_MP/form.js
diff --git a/ABINIT_MP/form.yml.erb b/ABINIT_MP/form.yml.erb
@@ -15,8 +15,8 @@ form:
 <%= form_version(versions) %>
 <%= form_exec(versions[0], ab[0], "abinitmp") %>
 <%= form_exec(versions[1], ab[1], "abinitmp") %>
-<%= form_working_dir(false) %>
-<%= form_input_file(true, "mpiexec [executable] < [input]") %>
+<%= form_working_dir2(false) %>
+<%= form_input_file2(true, "mpiexec [executable] < [input]") %>
 <%= form_fugaku_llio("input_file") %>
 <%= form_email(false) %>
 attributes:

diff --git a/ALAMODE/form.js b/ALAMODE/form.js
diff --git a/ALAMODE/form.yml.erb b/ALAMODE/form.yml.erb
@@ -9,8 +9,8 @@ title: ALAMODE
 form:
 <%= form_queue("fugaku_small") %>
 <%= form_version(versions) %>
-<%= form_working_dir(false) %>
-<%= form_input_file(true, "mpiexec anphon [input]") %>
+<%= form_working_dir2(false) %>
+<%= form_input_file2(true, "mpiexec anphon [input]") %>
 <%= form_email(false) %>
 attributes:
 <%= form_attr() %>
diff --git a/AkaiKKR/form.js b/AkaiKKR/form.js
diff --git a/AkaiKKR/form.yml.erb b/AkaiKKR/form.yml.erb
@@ -9,8 +9,8 @@ title: AkaiKKR
 form:
 <%= form_queue("fugaku_single") %>
 <%= form_version(versions) %>
-<%= form_working_dir(false) %>
-<%= form_input_file(true, "specx < [input] > [output]") %>
+<%= form_working_dir2(false) %>
+<%= form_input_file2(true, "specx < [input] > [output]") %>
 <%= form_output_file(true, "specx < [input] > [output]") %>
 <%= form_email(false) %>
 attributes:

diff --git a/FDS/form.js b/FDS/form.js
diff --git a/FDS/form.yml.erb b/FDS/form.yml.erb
@@ -8,8 +8,8 @@ title: FDS
 form:
 <%= form_queue("fugaku_small_and_large") %>
 <%= form_version(versions) %>
-<%= form_working_dir(false) %>
-<%= form_input_file() %>
+<%= form_working_dir2(false) %>
+<%= form_input_file2() %>
 <%= form_fugaku_llio("input_file") %>
 <%= form_email(false) %>
 attributes:

diff --git a/Gaussian/form.js b/Gaussian/form.js
diff --git a/Gaussian/form.yml.erb b/Gaussian/form.yml.erb
@@ -9,8 +9,8 @@ title: Gaussian
 form:
 <%= form_queue("fugaku_single") %>
 <%= form_version(versions) %>
-<%= form_working_dir(false) %>
-<%= form_input_file(true,  "g16 < [input] > [output]") %>
+<%= form_working_dir2(false) %>
+<%= form_input_file2(true,  "g16 < [input] > [output]") %>
 <%= form_output_file(true, "g16 < [input] > [output]") %>
 <%= form_email(false) %>
 attributes:

diff --git a/HPhi/form.js b/HPhi/form.js
diff --git a/HPhi/form.yml.erb b/HPhi/form.yml.erb
@@ -10,8 +10,8 @@ form:
 <%= form_queue("fugaku_small_and_large") %>
 <%= form_version(versions) %>
 <%= form_select("se_mode", "Mode", [["--standard", "--standard"], ["--expert", "--expert"]]) %>
-<%= form_working_dir(false) %>
-<%= form_input_file() %>
+<%= form_working_dir2(false) %>
+<%= form_input_file2() %>
 <%= form_fugaku_llio("input_file") %>
 <%= form_email(false) %>
 attributes:

diff --git a/LAMMPS/form.js b/LAMMPS/form.js
diff --git a/LAMMPS/form.yml.erb b/LAMMPS/form.yml.erb
@@ -8,8 +8,8 @@ title: LAMMPS
 form:
 <%= form_queue("fugaku_small") %>
 <%= form_version(versions) %>
-<%= form_working_dir(false) %>
-<%= form_input_file(true, "mpiexec lmp -in [input]") %>
+<%= form_working_dir2(false) %>
+<%= form_input_file2(true, "mpiexec lmp -in [input]") %>
 <%= form_options("e.g. -pk omp 2") %>
 <%= form_email(false) %>
 attributes:

diff --git a/OpenMX/form.js b/OpenMX/form.js
diff --git a/OpenMX/form.yml.erb b/OpenMX/form.yml.erb
@@ -11,8 +11,8 @@ form:
 <%= form_queue("fugaku_small") %>
 <%= form_version(versions) %>
 <%= form_exec(versions[0], openmx39, "openmx") %>
-<%= form_working_dir(false) %>
-<%= form_input_file() %>
+<%= form_working_dir2(false) %>
+<%= form_input_file2() %>
 <%= form_options("e.g. –nt 2") %>
 <%= form_email(false) %>
 attributes:

diff --git a/Quantum_Espresso/form.js b/Quantum_Espresso/form.js
diff --git a/Quantum_Espresso/form.yml.erb b/Quantum_Espresso/form.yml.erb
@@ -19,8 +19,8 @@ form:
 <%= form_exec(versions[1], qe[1], "pw.x") %>
 <%= form_exec(versions[2], qe[2], "pw.x") %>
 <%= form_exec(versions[3], qe[3], "pw.x") %>
-<%= form_working_dir(false) %>
-<%= form_input_file(true, "-in [input]") %>
+<%= form_working_dir2(false) %>
+<%= form_input_file2(true, "-in [input]") %>
 <%= form_options("e.g. -nk 2") %>
 <%= form_email(false) %>
 attributes:

diff --git a/SALMON/form.js b/SALMON/form.js
diff --git a/SALMON/form.yml.erb b/SALMON/form.yml.erb
@@ -8,8 +8,8 @@ title: SALMON
 form:
 <%= form_queue("fugaku_small_and_large") %>
 <%= form_version(versions) %>
-<%= form_working_dir(false) %>
-<%= form_input_file(true, "mpiexec salmon < [input]") %>
+<%= form_working_dir2(false) %>
+<%= form_input_file2(true, "mpiexec salmon < [input]") %>
 <%= form_fugaku_llio("input_file") %>
 <%= form_email(false) %>
 attributes:

diff --git a/SCALE/form.js b/SCALE/form.js
diff --git a/SCALE/form.yml.erb b/SCALE/form.yml.erb
@@ -10,11 +10,11 @@ form:
 <%= form_queue("fugaku_small_and_large") %>
 <%= form_version(versions) %>
 <%= form_working_dir() %>
-<%= form_multi_input_files(false, "scale_rm_pp",   "for scale-rm_pp (If blank, scale-rm_pp will not run)") %>
-<%= form_multi_input_files(false, "scale_rm_init", "for scale-rm_init (If blank, scale-rm_init will not run)") %>
-<%= form_multi_input_files(false, "scale_rm",      "for scale-rm (If blank, scale-rm will not run)") %>
-<%= form_multi_input_files(false, "sno",           "for sno (If blank, sno will not run)") %>
-<%= form_multi_input_files(false, "net2g",         "for net2g (If blank, net2g will not run)") %>
+<%= form_multi_input_files2(false, "scale_rm_pp",   "for scale-rm_pp (If blank, scale-rm_pp will not run)") %>
+<%= form_multi_input_files2(false, "scale_rm_init", "for scale-rm_init (If blank, scale-rm_init will not run)") %>
+<%= form_multi_input_files2(false, "scale_rm",      "for scale-rm (If blank, scale-rm will not run)") %>
+<%= form_multi_input_files2(false, "sno",           "for sno (If blank, sno will not run)") %>
+<%= form_multi_input_files2(false, "net2g",         "for net2g (If blank, net2g will not run)") %>
 <%= form_fugaku_llio("working_dir") %>
 <%= form_email(false) %>
 attributes:

diff --git a/SMASH/form.js b/SMASH/form.js
diff --git a/SMASH/form.yml.erb b/SMASH/form.yml.erb
@@ -1,15 +1,16 @@
 <%-
   require '/var/www/ood/apps/sys/ondemand_fugaku/misc/utils.rb'
-  # spack versions smash -s
-  versions = ["3.0.2", "3.0.0"]
+  # spack versions fds -s
+  versions = ["6.7.9"]
 -%>
 ---
-title: SMASH
+title: FDS
 form:
-<%= form_queue("fugaku_small") %>
+<%= form_queue("fugaku_small_and_large") %>
 <%= form_version(versions) %>
-<%= form_working_dir(false) %>
-<%= form_input_file(true, "mpiexec smash [input]") %>
+<%= form_working_dir2(false) %>
+<%= form_input_file2() %>
+<%= form_fugaku_llio("input_file") %>
 <%= form_email(false) %>
 attributes:
 <%= form_attr() %>
diff --git a/braket/form.js b/braket/form.js
diff --git a/braket/form.yml.erb b/braket/form.yml.erb
@@ -9,8 +9,8 @@ title: braket
 form:
 <%= form_queue("fugaku_small") %>
 <%= form_version(versions) %>
-<%= form_working_dir() %>  
-<%= form_input_file(true, "mpiexec bra --mode simple --file [input]") %>
+<%= form_working_dir2() %>  
+<%= form_input_file2(true, "mpiexec bra --mode simple --file [input]") %>
 <%= form_email(false) %>
 attributes:
 <%= form_attr() %>
diff --git a/mVMC/form.js b/mVMC/form.js
diff --git a/mVMC/form.yml.erb b/mVMC/form.yml.erb
@@ -13,8 +13,8 @@ form:
 <%= form_version(versions) %>
 <%= form_select("exec_file", "Executable file", exec_file) %>
 <%= form_select("se_mode", "Mode", [["--standard", "-s"], ["--expert", "-e"]]) %>
-<%= form_working_dir(false) %>
-<%= form_input_file() %>
+<%= form_working_dir2(false) %>
+<%= form_input_file2() %>
 <%= form_output_file(false, memo = "Default is output.${PJM_JOBID}") %>
 <%= form_fugaku_llio("input_file") %>
 <%= form_email(false) %>

diff --git a/misc/utils.rb b/misc/utils.rb
@@ -787,6 +787,24 @@ def form_input_file(required = true, memo = "")
   return "  - input_file"
 end
 
+def form_input_file2(required = true, memo = "")
+  memo = "(" + memo + ")" if memo != ""
+
+  $attr <<<<"EOF"
+  input_file:
+    label: Input file #{memo}
+    data-filepicker: true
+    data-target-file-type: files  # Valid values are: files, dirs, or both
+    # Optionally set a default directory
+    data-default-directory: #{ENV['HOME']}
+    # Optionally only allow editing through the file picker; defaults to false
+    data-file_picker_favorites: #{get_groups_fdirs()}
+    required: #{required.to_s}
+EOF
+
+  return "  - input_file"
+end
+
 def form_multi_input_files(required = true, prefix = "", label = "")
   $attr <<<<"EOF"
   input_file_#{prefix}:
@@ -801,6 +819,22 @@ def form_multi_input_files(required = true, prefix = "", label = "")
   return "  - input_file_" + prefix
 end
 
+def form_multi_input_files2(required = true, prefix = "", label = "")
+  $attr <<<<"EOF"
+  input_file_#{prefix}:
+    label: Input file #{label}
+    data-filepicker: true
+    data-target-file-type: files  # Valid values are: files, dirs, or both
+    # Optionally set a default directory
+    data-default-directory: #{ENV['HOME']}
+    # Optionally only allow editing through the file picker; defaults to false
+    data-file_picker_favorites: #{get_groups_fdirs()}
+    required: #{required.to_s}
+EOF
+
+  return "  - input_file_" + prefix
+end
+
 def form_output_file(required = true, memo = "")
   memo = "(" + memo + ")" if memo != ""
 
@@ -830,6 +864,22 @@ def form_working_dir(required = true, label = "Working directory", type = "dirs"
   return "  - " + item
 end
 
+def form_working_dir2(required = true, label = "Working directory", type = "dirs", item = "working_dir", help = "")
+  $attr <<<<"EOF"
+  #{item}:
+    label: #{label}
+    value: #{ENV['HOME']}
+    data-target-file-type: #{type}
+    data-filepicker: true
+    data-default-directory: #{ENV['HOME']}
+    data-file_picker_favorites: #{get_groups_fdirs()}
+    required: #{required.to_s}
+    help: #{help}
+EOF
+
+  return "  - " + item
+end
+
 def form_fugaku_llio(flag, memo = "")
   memo = "Executable files are transferred there automatically." if memo == ""