From beb2256029822a25a42a63ad1501fa547c813f03 Mon Sep 17 00:00:00 2001 From: Shahzad Malik Muzaffar Date: Tue, 12 Mar 2024 23:31:43 +0100 Subject: [PATCH 1/2] Add tf_cuda_support tool if TF is build with cuda support --- scram-tools.file/bin/get_tools | 23 +++++++++++++++-------- tensorflow.spec | 7 +++++++ 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/scram-tools.file/bin/get_tools b/scram-tools.file/bin/get_tools index 3f5490660b0..74866acc06a 100755 --- a/scram-tools.file/bin/get_tools +++ b/scram-tools.file/bin/get_tools @@ -1,6 +1,17 @@ #!/bin/bash -ex #Usage: get_tool +function copy_tools (){ + for xml in $(find $1 -type f -name "*.xml") ; do + bxml=$(basename $xml) + [ -f ${TOOLFILES_INSTALL_DIR}/tools/selected/$bxml ] && continue + [ -f ${TOOLFILES_INSTALL_DIR}/tools/available/$bxml ] && continue + cp $xml ${TOOLFILES_INSTALL_DIR}/tools/selected/${bxml} + perl -p -i -e 's|\@([a-zA-Z0-9_-]*)\@|$ENV{$1}|g' ${TOOLFILES_INSTALL_DIR}/tools/selected/${bxml} + echo " Copied $bxml" + done +} + export TOOL_ROOT=$1 export TOOL_VERSION=$2 export TOOLFILES_INSTALL_DIR=$3 @@ -16,11 +27,7 @@ if [ -f $tool_script ]; then source $tool_script; fi #Copy all tools and replace the env placeholders @VARIABLES@ [ -d ${TOOLFILES_INSTALL_DIR}/tools/selected ] || mkdir -p ${TOOLFILES_INSTALL_DIR}/tools/selected -for xml in $(find $SCRAM_TOOL_SOURCE_DIR -type f -name "*.xml") ; do - bxml=$(basename $xml) - [ -f ${TOOLFILES_INSTALL_DIR}/tools/selected/$bxml ] && continue - [ -f ${TOOLFILES_INSTALL_DIR}/tools/available/$bxml ] && continue - cp $xml ${TOOLFILES_INSTALL_DIR}/tools/selected/${bxml} - perl -p -i -e 's|\@([a-zA-Z0-9_-]*)\@|$ENV{$1}|g' ${TOOLFILES_INSTALL_DIR}/tools/selected/${bxml} - echo " Copied $bxml" -done +copy_tools $SCRAM_TOOL_SOURCE_DIR +if [ -d ${TOOL_ROOT}/etc/scram.d ] ; then + copy_tools ${TOOL_ROOT}/etc/scram.d +fi diff --git a/tensorflow.spec b/tensorflow.spec index 9e3c157c052..af6422a8d51 100644 --- a/tensorflow.spec +++ b/tensorflow.spec @@ -25,6 +25,13 @@ esac %install tar xfz ${%{tf_root}}/libtensorflow_cc.tar.gz -C %{i} +%if %{enable_gpu} +mkdir -p %{i}/etc/scram.d +cat << \EOF_TOOLFILE >%{i}/etc/scram.d/tf_cuda_support.xml + + +EOF_TOOLFILE +%endif %post %{relocateConfig}lib/lib*.params From 296ba1a1838a0f920c59c327fe0f5df303e6c82e Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Tue, 12 Mar 2024 23:48:50 +0100 Subject: [PATCH 2/2] Update tensorflow.spec Co-authored-by: Matti Kortelainen --- tensorflow.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tensorflow.spec b/tensorflow.spec index af6422a8d51..25014bf1062 100644 --- a/tensorflow.spec +++ b/tensorflow.spec @@ -29,7 +29,7 @@ tar xfz ${%{tf_root}}/libtensorflow_cc.tar.gz -C %{i} mkdir -p %{i}/etc/scram.d cat << \EOF_TOOLFILE >%{i}/etc/scram.d/tf_cuda_support.xml - + EOF_TOOLFILE %endif