Minor fixes to FSL 6.0.6 build

SPMIC-UoN · Aug 9, 2022 · 413c5f2 · 413c5f2
1 parent 63c9e56
commit 413c5f2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -87,7 +87,7 @@ cudimot_${MODELNAME}.sh : ${MODELNAME}
 	./generate_wrapper.sh ${MODELNAME}
 
 ${MODELNAME}.info : cudimot_${MODELNAME}.sh
-	./generate_info.sh ${MODELNAME}
+	./generate_info.sh ${MODELNAME} ${MODELDIR}
 
 ${MODELNAME}_priors:
 	cp ${MODELDIR}/modelpriors $@
diff --git a/generate_info.sh b/generate_info.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 MODELNAME=$1
+MODELDIR=$2
 
 # No text file with info about the model
 #outDIR=`cat Makefile | grep DIR_objs= | cut -f 2 -d "="`
@@ -10,17 +11,17 @@ echo > $infoFile
 echo "---------------------------------------------" >> $infoFile
 echo "---------------- NPARAMETERS  ---------------" >> $infoFile
 echo "---------------------------------------------" >> $infoFile
-cat mymodels/${MODELNAME}/modelparameters.h | grep define | grep -v INCLUDED >> $infoFile
+cat ${MODELDIR}/modelparameters.h | grep define | grep -v INCLUDED >> $infoFile
 echo >> $infoFile
-cat mymodels/${MODELNAME}/modelparameters.cc | grep int >> $infoFile
+cat ${MODELDIR}/modelparameters.cc | grep int >> $infoFile
 echo "---------------------------------------------" >> $infoFile
 echo >> $infoFile
-cat mymodels/${MODELNAME}/modelparameters.h | grep type >> $infoFile
+cat ${MODELDIR}/modelparameters.h | grep type >> $infoFile
 echo >> $infoFile
 echo >> $infoFile
 
 echo "-------------------------------------------------------------" >> $infoFile
 echo "--- Predicted Signal, Constraints & Derivatives Functions ---" >> $infoFile
 echo "--- FILE: "$functionsFile" ---" >> $infoFile
 echo "-------------------------------------------------------------" >> $infoFile
-cat mymodels/${MODELNAME}/modelfunctions.h >> $infoFile
+cat ${MODELDIR}/modelfunctions.h >> $infoFile
diff --git a/generate_wrapper.sh b/generate_wrapper.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 MODELNAME=$1
+SRCDIR=`dirname "$0"`
 
 # Generate Wrapper
 scriptFile=cudimot_${MODELNAME}.sh
@@ -12,5 +13,5 @@ echo "#" >> $scriptFile
 echo "" >> $scriptFile
 
 echo "modelname=${MODELNAME}" >> $scriptFile
-cat wrapper_template.sh >> $scriptFile
+cat ${SRCDIR}/wrapper_template.sh >> $scriptFile
 chmod 755 $scriptFile