diff --git a/docs/_static/data/metrics.json b/docs/_static/data/metrics.json index 61e2464..779745f 100644 --- a/docs/_static/data/metrics.json +++ b/docs/_static/data/metrics.json @@ -3,7 +3,6 @@ "name": "app-amg", "description": "parallel algebraic multigrid solver for linear systems arising from problems on unstructured grids", "family": "solver", - "type": "", "image": "ghcr.io/converged-computing/metric-amg:latest", "url": "https://github.com/LLNL/AMG" }, @@ -11,7 +10,6 @@ "name": "app-bdas", "description": "The big data analytic suite contains the K-Means observation label, PCA, and SVM benchmarks.", "family": "machine-learning", - "type": "", "image": "ghcr.io/converged-computing/metric-bdas:latest", "url": "https://asc.llnl.gov/sites/asc/files/2020-09/BDAS_Summary_b4bcf27_0.pdf" }, @@ -19,7 +17,6 @@ "name": "app-hpl", "description": "High-Performance Linpack (HPL)", "family": "solver", - "type": "", "image": "ghcr.io/converged-computing/metric-hpl-spack:latest", "url": "https://www.netlib.org/benchmark/hpl/" }, @@ -27,7 +24,6 @@ "name": "app-kripke", "description": "parallel algebraic multigrid solver for linear systems arising from problems on unstructured grids", "family": "solver", - "type": "", "image": "ghcr.io/converged-computing/metric-kripke:latest", "url": "https://github.com/LLNL/Kripke" }, @@ -35,7 +31,6 @@ "name": "app-laghos", "description": "LAGrangian High-Order Solver", "family": "solver", - "type": "", "image": "ghcr.io/converged-computing/metric-laghos:latest", "url": "https://github.com/CEED/Laghos" }, @@ -43,7 +38,6 @@ "name": "app-lammps", "description": "LAMMPS molecular dynamic simulation", "family": "simulation", - "type": "", "image": "ghcr.io/converged-computing/metric-lammps:latest", "url": "https://www.lammps.org/" }, @@ -51,7 +45,6 @@ "name": "app-ldms", "description": "provides LDMS, a low-overhead, low-latency framework for collecting, transferring, and storing metric data on a large distributed computer system.", "family": "performance", - "type": "", "image": "ghcr.io/converged-computing/metric-ovis-hpc:latest", "url": "https://github.com/ovis-hpc/ovis" } diff --git a/docs/_static/data/table.html b/docs/_static/data/table.html index ec9a672..963d063 100644 --- a/docs/_static/data/table.html +++ b/docs/_static/data/table.html @@ -415,7 +415,6 @@ Name - Type Family Description Container @@ -440,7 +439,6 @@ } return "" + data +"";}, }, - { data: "type"}, { data: "family"}, { data: "description"}, { data: "image", diff --git a/hack/docs-gen/main.go b/hack/docs-gen/main.go index f5304c7..f46eb2e 100644 --- a/hack/docs-gen/main.go +++ b/hack/docs-gen/main.go @@ -24,7 +24,6 @@ type MetricOutput struct { Name string `json:"name"` Description string `json:"description"` Family string `json:"family"` - Type string `json:"type"` Image string `json:"image"` Url string `json:"url"` } diff --git a/pkg/metrics/app/hpl.go b/pkg/metrics/app/hpl.go index 2becffd..de334bf 100644 --- a/pkg/metrics/app/hpl.go +++ b/pkg/metrics/app/hpl.go @@ -271,63 +271,63 @@ func (m HPL) PrepareContainers( memoryCmd := `awk '/MemFree/ { printf "%.3f \n", $2/1024/1024 }' /proc/meminfo` preBlock := ` - # Source spack environment - . /opt/spack-environment/activate.sh +# Source spack environment +. /opt/spack-environment/activate.sh - # Calculate memory, if not defined - memory=%d - if [[ $memory -eq 0 ]]; then - memory=$(%s) - fi +# Calculate memory, if not defined +memory=%d +if [[ $memory -eq 0 ]]; then + memory=$(%s) +fi - echo "Memory is ${memory}" +echo "Memory is ${memory}" - np=%d - pods=%d - # Tasks per node, not total - tasks=$(nproc) - if [[ $np -eq 0 ]]; then - np=$(( $pods*$tasks )) - fi +np=%d +pods=%d +# Tasks per node, not total +tasks=$(nproc) +if [[ $np -eq 0 ]]; then + np=$(( $pods*$tasks )) +fi - echo "Number of tasks (nproc on one node) is $tasks" - echo "Number of tasks total (across $pods nodes) is $np" +echo "Number of tasks (nproc on one node) is $tasks" +echo "Number of tasks total (across $pods nodes) is $np" - blocksize=%d - ratio=%s +blocksize=%d +ratio=%s - # This calculates the compute value - retrieved from tutorials in /opt/view/bin - compute_script="compute_N -m ${memory} -NB ${blocksize} -r ${ratio} -N ${pods}" - echo $compute_script - # This is the size, variable "N" in the hpl.dat (not confusing or anything) - size=$(${compute_script}) - echo "Compute size is ${size}" +# This calculates the compute value - retrieved from tutorials in /opt/view/bin +compute_script="compute_N -m ${memory} -NB ${blocksize} -r ${ratio} -N ${pods}" +echo $compute_script +# This is the size, variable "N" in the hpl.dat (not confusing or anything) +size=$(${compute_script}) +echo "Compute size is ${size}" - # Define rest of envars we need for template - row_or_colmajor_pmapping=%d - pfact=%d - nbmin=%d - ndiv=%d - rfact=%d - bcast=%d - depth=%d - swap=%d - swapping_threshold=%d - L1_transposed=%d - U_transposed=%d - mem_alignment=%d +# Define rest of envars we need for template +row_or_colmajor_pmapping=%d +pfact=%d +nbmin=%d +ndiv=%d +rfact=%d +bcast=%d +depth=%d +swap=%d +swapping_threshold=%d +L1_transposed=%d +U_transposed=%d +mem_alignment=%d - # Write the input file (this parses environment variables too) - cat < ./hpl.dat - %s - EOF +# Write the input file (this parses environment variables too) +cat < ./hpl.dat +%s +EOF - cp ./hostlist.txt ./hostnames.txt - rm ./hostlist.txt - %s +cp ./hostlist.txt ./hostnames.txt +rm ./hostlist.txt +%s - echo "%s" - # This is in /root/hpl/bin/linux/xhpl +echo "%s" +# This is in /root/hpl/bin/linux/xhpl ` postBlock := `