diff --git a/2026-RIKEN/docker/Dockerfile.spawn b/2026-RIKEN/docker/Dockerfile.spawn index e0628c1..6fb9f6a 100644 --- a/2026-RIKEN/docker/Dockerfile.spawn +++ b/2026-RIKEN/docker/Dockerfile.spawn @@ -90,9 +90,6 @@ COPY ./tutorial-code/thicket-tutorial/notebooks/01_thicket_tutorial.ipynb ${HOME COPY ./tutorial-code/thicket-tutorial/notebooks/02_thicket_rajaperf_clustering.ipynb ${HOME}/thicket-tutorial/notebooks/02_thicket_rajaperf_clustering.ipynb COPY ./tutorial-code/thicket-tutorial/LICENSE ${HOME}/thicket-tutorial -COPY tutorial-code/system-description/aws-tutorial ${HOME}/benchpark/systems/aws-tutorial -COPY tutorial-code/system-description/AWS_Tutorial-c7i-EFA ${HOME}/benchpark/systems/all_hardware_descriptions/AWS_Tutorial-c7i-EFA - RUN chown -R jovyan ${HOME} # RUN chmod -R 777 ~/ ${HOME} diff --git a/2026-RIKEN/tutorial-code/system-description/AWS_Tutorial-c7i-EFA/hardware_description.yaml b/2026-RIKEN/tutorial-code/system-description/AWS_Tutorial-c7i-EFA/hardware_description.yaml deleted file mode 100644 index c7b89e4..0000000 --- a/2026-RIKEN/tutorial-code/system-description/AWS_Tutorial-c7i-EFA/hardware_description.yaml +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 2023 Lawrence Livermore National Security, LLC and other -# Benchpark Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: Apache-2.0 - -system_definition: - name: AWS_Tutorial-c7i-EFA - integrator: - vendor: AWS - name: EKS - processor: - vendor: Intel - name: Xeon Sapphire Rapids - ISA: x86_64 - uArch: SapphireRapids - accelerator: - vendor: - name: - ISA: - uArch: - interconnect: - vendor: AWS - name: EFA - systems-tested: - aws-pcluster: - os: ubuntu-22.04 - scheduler: flux - compiler: gcc - runtime: - mpi: mpich - instance-types: https://aws.amazon.com/ec2/instance-types/c7i/ diff --git a/2026-RIKEN/tutorial-code/system-description/aws-tutorial/system.py b/2026-RIKEN/tutorial-code/system-description/aws-tutorial/system.py deleted file mode 100644 index 26e6e65..0000000 --- a/2026-RIKEN/tutorial-code/system-description/aws-tutorial/system.py +++ /dev/null @@ -1,260 +0,0 @@ -# Copyright 2023 Lawrence Livermore National Security, LLC and other -# Benchpark Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: Apache-2.0 - -import json -import subprocess - -from benchpark.directives import maintainers, variant -from benchpark.openmpsystem import OpenMPCPUOnlySystem -from benchpark.paths import hardware_descriptions -from benchpark.system import System - - -class AwsTutorial(System): - # Taken from https://aws.amazon.com/ec2/instance-types/ - # With boto3, we could determine this dynamically vs. storing a static table - - maintainers("stephanielam3211") - - id_to_resources = { - "c7i.48xlarge": { - "system_site": "aws", - "hardware_key": str(hardware_descriptions) - + "/AWS_Tutorial-zen-EFA/hardware_description.yaml", - }, - "c7i.metal-48xl": { - "system_site": "aws", - "hardware_key": str(hardware_descriptions) - + "/AWS_Tutorial-zen-EFA/hardware_description.yaml", - }, - "c7i.24xlarge": { - "system_site": "aws", - "hardware_key": str(hardware_descriptions) - + "/AWS_Tutorial-zen-EFA/hardware_description.yaml", - }, - "c7i.metal-24xl": { - "system_site": "aws", - "hardware_key": str(hardware_descriptions) - + "/AWS_Tutorial-zen-EFA/hardware_description.yaml", - }, - "c7i.12xlarge": { - "system_site": "aws", - "hardware_key": str(hardware_descriptions) - + "/AWS_Tutorial-zen-EFA/hardware_description.yaml", - }, - } - - variant( - "instance_type", - values=("c7i.48xlarge", "c7i.metal-48xl", "c7i.24xlarge", "c7i.metal-24xl", "c7i.12xlarge"), - default="c7i.24xlarge", - description="AWS instance type", - ) - - def __init__(self, spec): - super().__init__(spec) - self.programming_models = [OpenMPCPUOnlySystem()] - - self.scheduler = "flux" - # TODO: for some reason I have to index to get value, even if multi=False - attrs = self.id_to_resources.get(self.spec.variants["instance_type"][0]) - for k, v in attrs.items(): - setattr(self, k, v) - - json_resource_spec = subprocess.check_output("flux resource R", shell=True) - resource_dict = json.loads(json_resource_spec) - self.sys_cores_per_node = resource_dict["execution"]["R_lite"][0]["children"][ - "core" - ] - self.sys_cores_per_node = [int(c) for c in self.sys_cores_per_node.split("-")] - self.sys_cores_per_node[-1] += 1 - self.sys_cores_per_node = len(list(range(*self.sys_cores_per_node))) - self.sys_nodes = resource_dict["execution"]["R_lite"][0]["rank"] - self.sys_nodes = [int(n) for n in self.sys_nodes.split("-")] - self.sys_nodes[-1] += 1 - self.sys_nodes = len(list(range(*self.sys_nodes))) - - # def system_specific_variables(self): - # return { - # "extra_cmd_opts": '--mpi=pmix --export=ALL,FI_EFA_USE_DEVICE_RDMA=1,FI_PROVIDER="efa",OMPI_MCA_mtl_base_verbose=100', - # } - - def compute_packages_section(self): - return { - "packages": { - "tar": { - "externals": [{"spec": "tar@1.34", "prefix": "/usr"}], - "buildable": False, - }, - "gmake": {"externals": [{"spec": "gmake@4.3", "prefix": "/usr"}]}, - "lapack": { - "externals": [{"spec": "lapack@0.29.2", "prefix": "/usr"}], - "buildable": False, - }, - "mpi": {"buildable": False}, - "openmpi": { - "externals": [ - { - "spec": "openmpi@4.0%gcc@11.4.0", - "prefix": "/usr", - } - ] - }, - "cmake": { - "externals": [{"spec": "cmake@4.0.2", "prefix": "/usr"}], - "buildable": False, - }, - "git": { - "externals": [{"spec": "git@2.34.1~tcltk", "prefix": "/usr"}], - "buildable": False, - }, - "openssl": { - "externals": [{"spec": "openssl@3.0.2", "prefix": "/usr"}], - "buildable": False, - }, - "automake": { - "externals": [{"spec": "automake@1.16.5", "prefix": "/usr"}], - "buildable": False, - }, - "openssh": { - "externals": [{"spec": "openssh@8.9p1", "prefix": "/usr"}], - "buildable": False, - }, - "m4": { - "externals": [{"spec": "m4@1.4.18", "prefix": "/usr"}], - "buildable": False, - }, - "sed": { - "externals": [{"spec": "sed@4.8", "prefix": "/usr"}], - "buildable": False, - }, - "autoconf": { - "externals": [{"spec": "autoconf@2.71", "prefix": "/usr"}], - "buildable": False, - }, - "diffutils": { - "externals": [{"spec": "diffutils@3.8", "prefix": "/usr"}], - "buildable": False, - }, - "coreutils": { - "externals": [{"spec": "coreutils@8.32", "prefix": "/usr"}], - "buildable": False, - }, - "findutils": { - "externals": [{"spec": "findutils@4.8.0", "prefix": "/usr"}], - "buildable": False, - }, - "binutils": { - "externals": [ - {"spec": "binutils@2.38+gold~headers", "prefix": "/usr"} - ], - "buildable": False, - }, - "perl": { - "externals": [ - { - "spec": "perl@5.34.0~cpanm+opcode+open+shared+threads", - "prefix": "/usr", - } - ], - "buildable": False, - }, - "caliper": { - "externals": [ - { - "spec": "caliper@master%gcc@11.4.0+adiak+mpi", - "prefix": "/usr", - } - ], - "buildable": False, - }, - "adiak": { - "externals": [{"spec": "adiak@0.4.1", "prefix": "/usr"}], - "buildable": False, - }, - "groff": { - "externals": [{"spec": "groff@1.22.4", "prefix": "/usr"}], - "buildable": False, - }, - "curl": { - "externals": [ - {"spec": "curl@7.81.0+gssapi+ldap+nghttp2", "prefix": "/usr"} - ], - "buildable": False, - }, - "ccache": { - "externals": [{"spec": "ccache@4.5.1", "prefix": "/usr"}], - "buildable": False, - }, - "flex": { - "externals": [{"spec": "flex@2.6.4+lex", "prefix": "/usr"}], - "buildable": False, - }, - "pkg-config": { - "externals": [{"spec": "pkg-config@0.29.2", "prefix": "/usr"}], - "buildable": False, - }, - "zlib": { - "externals": [{"spec": "zlib@1.2.11", "prefix": "/usr"}], - "buildable": False, - }, - "ninja": { - "externals": [{"spec": "ninja@1.10.1", "prefix": "/usr"}], - "buildable": False, - }, - "libtool": { - "externals": [{"spec": "libtool@2.4.6", "prefix": "/usr"}], - "buildable": False, - }, - } - } - - def compute_compilers_section(self): - return { - "compilers": [ - { - "compiler": { - "spec": "gcc@11.4.0", - "paths": { - "cc": "/usr/bin/gcc", - "cxx": "/usr/bin/g++", - "f77": "/usr/bin/gfortran-11", - "fc": "/usr/bin/gfortran-11", - }, - "flags": {}, - "operating_system": "ubuntu22.04", - "target": "x86_64", - "modules": [], - "environment": {}, - "extra_rpaths": [], - } - } - ] - } - - def compute_software_section(self): - return { - "software": { - "packages": { - "default-compiler": {"pkg_spec": "gcc@11.4.0"}, - "default-mpi": {"pkg_spec": "openmpi@4.0%gcc@11.4.0"}, - "compiler-gcc": {"pkg_spec": "gcc@11.4.0"}, - "lapack": {"pkg_spec": "lapack@0.29.2"}, - "mpi-gcc": {"pkg_spec": "openmpi@4.0%gcc@11.4.0"}, - } - } - } - - def compute_spack_config_section(self): - return { - "config": {}, - "concretizer": {}, - "modules": {}, - "packages": {}, - "repos": [], - "compilers": [], - "mirrors": {}, - "providers": {"mpi": ["openmpi"]}, - }