DAOSGCP-106 Add io500-isc22

terraform/examples/io500/build_daos_io500_images.sh

@@ -40,7 +40,7 @@ INSTALL_SCRIPTS=(
 install_devtools.sh
 install_intel-oneapi.sh
 install_mpifileutils.sh
-install_io500-sc21.sh
+install_io500-isc22.sh
 )
 
 # Reverse the INSTALL_SCRIPTS array

terraform/examples/io500/install_scripts/install_io500-isc22.sh

@@ -0,0 +1,182 @@
+#!/bin/bash
+# Copyright 2022 Intel Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#
+# Install IO500 ISC22
+#
+# This script assumes
+#
+#   1. The intel-oneapi-mpi and intel-oneapi-mpi-devel
+#      packages from https://yum.repos.intel.com/oneapi have already been
+#      installed
+#      See install_intel-oneapi.sh in the same directory as this script.
+#
+#   2. mpifileutils has already been installed.
+#      See install_mpifileutils.sh in the same directory as this script.
+#
+
+set -e
+trap 'echo "An unexpected error occurred. Exiting."' ERR
+
+export IO500_VERSION_TAG="io500-isc22"
+
+# The following variable names match the instructions at
+# https://daosio.atlassian.net/wiki/spaces/DC/pages/11055792129/IO-500+SC21
+export MY_DAOS_INSTALL_PATH="${MY_DAOS_INSTALL_PATH:-/usr}"
+export MY_MFU_INSTALL_PATH="${MY_MFU_INSTALL_PATH:-/usr/local/mpifileutils/install}"
+export MY_MFU_SOURCE_PATH="${MY_MFU_SOURCE_PATH:-/usr/local/mpifileutils/src}"
+export MY_MFU_BUILD_PATH="${MY_MFU_BUILD_PATH:-/usr/local/mpifileutils/build}"
+export MY_IO500_PATH="${MY_IO500_PATH:-/usr/local/${IO500_VERSION_TAG}}"
+
+log() {
+  msg="$1"
+  print_lines="$2"
+  # shellcheck disable=SC2155,SC2183
+  local line=$(printf "%80s" | tr " " "-")
+  if [[ -t 1 ]]; then tput setaf 14; fi
+  if [[ "${print_lines}" == 1 ]]; then
+    printf -- "\n%s\n %-78s \n%s\n" "${line}" "${msg}" "${line}"
+  else
+    printf -- "\n%s\n\n" "${msg}"
+  fi
+  if [[ -t 1 ]]; then tput sgr0; fi
+}
+
+log_section() {
+  log "$1" "1"
+}
+
+# Exit if Intel OneAPI is not installed
+if [[ ! -d /opt/intel/oneapi ]]; then
+  log "ERROR: Intel OneAPI not found in /opt/intel/oneapi. Exiting."
+  exit 1
+fi
+
+# Exit if mpifileutils is not installed
+if [[ ! -d "${MY_MFU_INSTALL_PATH}" ]]; then
+  log "ERROR: mpifileutils not found in ${MY_MFU_INSTALL_PATH}. Exiting."
+  exit 1
+fi
+
+log_section "Installing IO500 ${IO500_VERSION_TAG}"
+
+# Load Intel MPI
+export I_MPI_OFI_LIBRARY_INTERNAL=0
+export I_MPI_OFI_PROVIDER="tcp;ofi_rxm"
+
+# shellcheck disable=SC1091
+source /opt/intel/oneapi/setvars.sh
+
+export LD_LIBRARY_PATH="${MY_MFU_INSTALL_PATH}/lib":$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH="${MY_MFU_INSTALL_PATH}/lib64":$LD_LIBRARY_PATH
+export PATH="${MY_MFU_INSTALL_PATH}/bin":$PATH
+
+IO500_INSTALL_PATH="$(dirname "${MY_IO500_PATH}")"
+mkdir -p "${IO500_INSTALL_PATH}"
+cd "${IO500_INSTALL_PATH}"
+
+log "Cloning https://github.com/IO500/io500 repo. Tag ${IO500_VERSION_TAG}"
+if [[ -d "${MY_IO500_PATH}" ]]; then
+  rm -rf "${MY_IO500_PATH}"
+fi
+
+git clone https://github.com/IO500/io500.git \
+  -b ${IO500_VERSION_TAG} \
+  "${MY_IO500_PATH}"
+cd "${MY_IO500_PATH}"
+git checkout -b "${IO500_VERSION_TAG}-daos"
+
+# Need to patch prepare.sh in order to:
+#   Point to the pfind that works with our mpifileutils
+#   Build ior with DFS support
+log "Patching ${MY_IO500_PATH}/prepare.sh"
+cd "${MY_IO500_PATH}"
+# Attempt to always ensure the patch applies successfully
+cp prepare.sh "prepare.sh.$(date "+%Y-%m-%d_%H%M%S")"
+git checkout prepare.sh
+cat > io500_prepare.patch <<'EOF'
+diff --git a/prepare.sh b/prepare.sh
+index f793dfe..03e41bb 100755
+--- a/prepare.sh
++++ b/prepare.sh
+@@ -7,8 +7,8 @@ echo It will also attempt to build the benchmarks
+ echo It will output OK at the end if builds succeed
+ echo
+
+ IOR_HASH=d3574d536643475269d37211e283b49ebd6732d7
+-PFIND_HASH=62c3a7e31
++PFIND_HASH=mfu_integration
+
+ INSTALL_DIR=$PWD
+ BIN=$INSTALL_DIR/bin
+@@ -59,7 +59,7 @@ function get_ior {
+
+ function get_pfind {
+   echo "Preparing parallel find"
+-  git_co https://github.com/VI4IO/pfind.git pfind $PFIND_HASH
++  git_co https://github.com/mchaarawi/pfind pfind $PFIND_HASH
+ }
+
+ function get_schema_tools {
+@@ -73,7 +73,7 @@ function build_ior {
+   pushd $BUILD/ior
+   ./bootstrap
+   # Add here extra flags
+-  ./configure --prefix=$INSTALL_DIR
++  ./configure --prefix=$INSTALL_DIR --with-daos=${MY_DAOS_INSTALL_PATH}
+   cd src
+   $MAKE clean
+   $MAKE install
+EOF
+
+git apply io500_prepare.patch
+
+# Update the Makefile with correct paths
+# The Makefile needs to be updated to use the install location of DAOS and MFU.
+log "Update ${MY_IO500_PATH}/Makefile with correct paths"
+
+cat > io500_Makefile.patch <<EOF
+diff --git a/Makefile b/Makefile
+index 2975471..5dce307 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,10 +1,13 @@
+ CC = mpicc
+ CFLAGS += -std=gnu99 -Wall -Wempty-body -Werror -Wstrict-prototypes -Werror=maybe-uninitialized -Warray-bounds
++CFLAGS += -I${MY_DAOS_INSTALL_PATH}/include -I${MY_MFU_INSTALL_PATH}/include
+
+ IORCFLAGS = \$(shell grep CFLAGS ./build/ior/src/build.conf | cut -d "=" -f 2-)
+ CFLAGS += -g3 -lefence -I./include/ -I./src/ -I./build/pfind/src/ -I./build/ior/src/
+ IORLIBS = \$(shell grep LDFLAGS ./build/ior/src/build.conf | cut -d "=" -f 2-)
+ LDFLAGS += -lm \$(IORCFLAGS) \$(IORLIBS) # -lgpfs # may need some additional flags as provided to IOR
++LDFLAGS += -L${MY_DAOS_INSTALL_PATH}/lib64 -ldaos -ldaos_common -ldfs -lgurt -luuid
++LDFLAGS += -L${MY_MFU_INSTALL_PATH}/lib64 -lmfu_dfind -lmfu
+
+ VERSION_GIT=\$(shell git describe --always --abbrev=12)
+ VERSION_TREE=\$(shell git diff src | wc -l | sed -e 's/   *//g' -e 's/^0//' | sed "s/\([0-9]\)/-\1/")
+EOF
+
+git apply io500_Makefile.patch
+
+# Run prepare.sh
+log "Running ${MY_IO500_PATH}/prepare.sh"
+"${MY_IO500_PATH}/prepare.sh"
+
+#log "Downloading example config from https://raw.githubusercontent.com/mchaarawi/io500/main/config-full-sc21.ini"
+#cd "${MY_IO500_PATH}"
+
+#wget https://raw.githubusercontent.com/mchaarawi/io500/main/config-full-sc21.ini
+
+log "IO500 ${IO500_VERSION_TAG} installation complete!"

terraform/examples/io500/io500-isc22.config-template.daos-rf0.ini

@@ -0,0 +1,83 @@
+#
+# -----------------------------------
+# LRZ DAOS ini file - 1x DAOS Server
+# -----------------------------------
+#
+# IO500 version io500-isc21_v1 :
+#
+# [RESULT]       ior-easy-write
+# [RESULT]    mdtest-easy-write
+# [      ]            timestamp
+# [RESULT]       ior-hard-write
+# [RESULT]    mdtest-hard-write
+# [RESULT]                 find
+# [RESULT]        ior-easy-read
+# [RESULT]     mdtest-easy-stat
+# [RESULT]        ior-hard-read
+# [RESULT]     mdtest-hard-stat
+# [RESULT]   mdtest-easy-delete
+# [RESULT]     mdtest-hard-read
+# [RESULT]   mdtest-hard-delete
+# [SCORE ] Bandwidth x.xx GiB/s : IOPS x.xx kiops : TOTAL x.xx
+#
+
+[global]
+datadir = $DAOS_FUSE/io500/datafiles
+timestamp-datadir = TRUE
+resultdir = $DAOS_FUSE/io500/results
+timestamp-resultdir = TRUE
+#API = POSIX
+api = DFS --dfs.pool=$DAOS_POOL --dfs.cont=$DAOS_CONT
+drop-caches = FALSE
+drop-caches-cmd = sudo -n bash -c "echo 3 > /proc/sys/vm/drop_caches"
+io-buffers-on-gpu = FALSE
+verbosity = 1
+scc = FALSE
+
+[debug]
+stonewall-time = $STONEWALL
+
+[ior-easy]
+#API = DFS --dfs.pool=$DAOS_POOL --dfs.cont=$DAOS_CONT --dfs.prefix=$DAOS_FUSE --dfs.dir_oclass=S1 --dfs.oclass=SX
+API = DFS --dfs.pool=$DAOS_POOL --dfs.cont=$DAOS_CONT --dfs.dir_oclass=S1 --dfs.oclass=SX
+#transferSize = 1m
+transferSize = 4m
+#transferSize = 16m
+blockSize = 99000000m
+filePerProc = FALSE
+#filePerProc = TRUE
+uniqueDir = FALSE
+verbosity =
+run = TRUE
+
+[mdtest-easy]
+API = DFS --dfs.pool=$DAOS_POOL --dfs.cont=$DAOS_CONT --dfs.dir_oclass=SX --dfs.oclass=S1
+n = 10000000
+run = TRUE
+
+[timestamp]
+
+[find-easy]
+nproc = $NPROC
+run = FALSE
+
+[ior-hard]
+API = DFS --dfs.pool=$DAOS_POOL --dfs.cont=$DAOS_CONT --dfs.dir_oclass=S1 --dfs.oclass=SX --dfs.chunk_size=470080
+segmentCount = 10000000
+verbosity =
+run = TRUE
+
+[mdtest-hard]
+API = DFS --dfs.pool=$DAOS_POOL --dfs.cont=$DAOS_CONT --dfs.dir_oclass=SX --dfs.oclass=S1
+n = 10000000
+files-per-dir =
+run = TRUE
+
+[find]
+nproc = $NPROC
+run = TRUE
+
+[find-hard]
+nproc = $NPROC
+run = FALSE
+