Restore other parts of the def file. (idaholab#29661)

grmnptr · Jan 10, 2025 · a3ab37b · a3ab37b
1 parent 0ef2288
commit a3ab37b
Showing 1 changed file with 58 additions and 58 deletions.
diff --git a/apptainer/moose-dev.def b/apptainer/moose-dev.def
@@ -85,37 +85,37 @@ Fingerprints: 0CFFCAB55E806363601C442D211817B01E0911DB
     CODE_SERVER_VERSION=4.92.2
 
     # Install code-server
-    # CODE_SERVER_FILE=code-server-${CODE_SERVER_VERSION}-amd64.rpm
-    # cd ${ROOT_BUILD_DIR}
-    # curl -fOL https://github.com/coder/code-server/releases/download/v${CODE_SERVER_VERSION}/${CODE_SERVER_FILE}
-    # rpm -i ${CODE_SERVER_FILE}
-    # rm ${CODE_SERVER_FILE}
+    CODE_SERVER_FILE=code-server-${CODE_SERVER_VERSION}-amd64.rpm
+    cd ${ROOT_BUILD_DIR}
+    curl -fOL https://github.com/coder/code-server/releases/download/v${CODE_SERVER_VERSION}/${CODE_SERVER_FILE}
+    rpm -i ${CODE_SERVER_FILE}
+    rm ${CODE_SERVER_FILE}
 
     # Setup directory for code-server extensions. The extensions folder can be
     # filled by other applications as they wish to have extensions auto installed
     # by the "setup-code-server-extensions" script (in PATH)
-    # mkdir /opt/code-server/extensions
+    mkdir /opt/code-server/extensions
     # Download extensions for code-server, currently just moose language support
-    # MOOSE_LANGUAGE_SUPPORT_VERSION=1.1.2
-    # cd /opt/code-server/extensions
-    # curl -L -O https://github.com/idaholab/moose-language-support/releases/download/v${MOOSE_LANGUAGE_SUPPORT_VERSION}/DanielSchwen.moose-language-support-${MOOSE_LANGUAGE_SUPPORT_VERSION}.vsix
+    MOOSE_LANGUAGE_SUPPORT_VERSION=1.1.2
+    cd /opt/code-server/extensions
+    curl -L -O https://github.com/idaholab/moose-language-support/releases/download/v${MOOSE_LANGUAGE_SUPPORT_VERSION}/DanielSchwen.moose-language-support-${MOOSE_LANGUAGE_SUPPORT_VERSION}.vsix
 
     # Setup permissions for the code server extras
-    # find /opt/code-server -type d -exec chmod 755 {} +
-    # chmod 755 /opt/code-server/bin/*
-    # chmod 644 /opt/code-server/extensions/*
-
-    # # Clone WASP
-    # cd ${ROOT_BUILD_DIR}
-    # WASP_SRC_DIR=${ROOT_BUILD_DIR}/wasp
-    # git clone ${WASP_GIT_REMOTE} ${WASP_SRC_DIR}
-    # cd ${WASP_SRC_DIR}
-    # git checkout ${WASP_GIT_SHA}
-    # git submodule update --init --recursive
-
-    # # Build and install wasp
-    # # This is redundant; hopefully we can use the one from conda in the future
-    # WASP_SRC_DIR=${WASP_SRC_DIR} ${WASP_BUILD_SCRIPT} -D CMAKE_INSTALL_PREFIX:STRING=${WASP_DIR}
+    find /opt/code-server -type d -exec chmod 755 {} +
+    chmod 755 /opt/code-server/bin/*
+    chmod 644 /opt/code-server/extensions/*
+
+    # Clone WASP
+    cd ${ROOT_BUILD_DIR}
+    WASP_SRC_DIR=${ROOT_BUILD_DIR}/wasp
+    git clone ${WASP_GIT_REMOTE} ${WASP_SRC_DIR}
+    cd ${WASP_SRC_DIR}
+    git checkout ${WASP_GIT_SHA}
+    git submodule update --init --recursive
+
+    # Build and install wasp
+    # This is redundant; hopefully we can use the one from conda in the future
+    WASP_SRC_DIR=${WASP_SRC_DIR} ${WASP_BUILD_SCRIPT} -D CMAKE_INSTALL_PREFIX:STRING=${WASP_DIR}
 
     # Install miniforge in MOOSE_MINIFORGE
     MINIFORGE_SCRIPT=${ROOT_BUILD_DIR}/miniforge3.sh
@@ -180,40 +180,40 @@ Fingerprints: 0CFFCAB55E806363601C442D211817B01E0911DB
 {%- endif %}
 
     # Install node.js. Requested by dschwen for bison
-    # dnf install -y nodejs npm
-
-# {% if PROFILING is defined %}
-#     # Install gperftools
-#     GPERFTOOLS_VERSION=gperftools-2.15
-#     cd ${ROOT_BUILD_DIR}
-#     git clone -b ${GPERFTOOLS_VERSION} --single-branch https://github.com/gperftools/gperftools.git
-#     GPERFTOOLS_SRC=${ROOT_BUILD_DIR}/gperftools
-#     cd ${GPERFTOOLS_SRC}
-#     ./autogen.sh
-#     ./configure --prefix={{ GPERF_DIR }} --enable-frame-pointers
-#     make -j ${MOOSE_JOBS}
-#     make install
-#     cd ~
-#     rm -rf ${GPERFTOOLS_SRC}
-
-#     # Install go for building pprof; to be removed
-#     GO_VERSION=1.23.1
-#     GO_TAR=${ROOT_BUILD_DIR}/go.tar.gz
-#     curl -L https://go.dev/dl/go${GO_VERSION}.linux-amd64.tar.gz -o ${GO_TAR}
-#     tar -C ${ROOT_BUILD_DIR} -xf ${GO_TAR}
-#     rm -rf ${GO_TAR}
-#     export PATH=${ROOT_BUILD_DIR}/go/bin:${PATH}
-#     export GOPATH=${ROOT_BUILD_DIR}/gopath
-#     mkdir ${GOPATH}
-
-#     # Install pprof
-#     PPROF_VERSION=a0b0bb1d4134f37be44de6c328680339b0fc13ad
-#     GOBIN={{ PPROF_DIR }}/bin go install github.com/google/pprof@${PPROF_VERSION}
-
-#     # Remove go now that pprof is installed
-#     go clean -cache -modcache
-#     rm -rf ${GOPATH} ${ROOT_BUILD_DIR}/go
-# {%- endif %}
+    dnf install -y nodejs npm
+
+{% if PROFILING is defined %}
+    # Install gperftools
+    GPERFTOOLS_VERSION=gperftools-2.15
+    cd ${ROOT_BUILD_DIR}
+    git clone -b ${GPERFTOOLS_VERSION} --single-branch https://github.com/gperftools/gperftools.git
+    GPERFTOOLS_SRC=${ROOT_BUILD_DIR}/gperftools
+    cd ${GPERFTOOLS_SRC}
+    ./autogen.sh
+    ./configure --prefix={{ GPERF_DIR }} --enable-frame-pointers
+    make -j ${MOOSE_JOBS}
+    make install
+    cd ~
+    rm -rf ${GPERFTOOLS_SRC}
+
+    # Install go for building pprof; to be removed
+    GO_VERSION=1.23.1
+    GO_TAR=${ROOT_BUILD_DIR}/go.tar.gz
+    curl -L https://go.dev/dl/go${GO_VERSION}.linux-amd64.tar.gz -o ${GO_TAR}
+    tar -C ${ROOT_BUILD_DIR} -xf ${GO_TAR}
+    rm -rf ${GO_TAR}
+    export PATH=${ROOT_BUILD_DIR}/go/bin:${PATH}
+    export GOPATH=${ROOT_BUILD_DIR}/gopath
+    mkdir ${GOPATH}
+
+    # Install pprof
+    PPROF_VERSION=a0b0bb1d4134f37be44de6c328680339b0fc13ad
+    GOBIN={{ PPROF_DIR }}/bin go install github.com/google/pprof@${PPROF_VERSION}
+
+    # Remove go now that pprof is installed
+    go clean -cache -modcache
+    rm -rf ${GOPATH} ${ROOT_BUILD_DIR}/go
+{%- endif %}
 
     # Clean up
     conda clean -ya