Skip to content

Commit

Permalink
apply pre-commit fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
berquist committed Aug 9, 2024
1 parent 9e026cd commit 1fbf9b9
Show file tree
Hide file tree
Showing 24 changed files with 161 additions and 167 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

These tests are used to validate changes to `sst-core` prior to accepting those changes into the development and then master branch of `sst-core`.

All of the tests used for SST are available on github, specifically
All of the tests used for SST are available on github, specifically
- this repo, and
- <https://github.com/sstsimulator/sst-elements>, and
- <https://github.com/sstsimulator/sst-elements>, and
- network traces from <https://github.com/sstsimulator/sst-downloads/releases/tag/TestFiles>
2 changes: 1 addition & 1 deletion buildsys/deps/bin/sstDep_dramsim_masterlatest.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# !/bin/bash
# sstDep_dramsim_masterlatest.sh

# Description:
# Description:

# A bash script containing functions to process SST's DRAMSim
# dependency.
Expand Down
4 changes: 2 additions & 2 deletions buildsys/deps/bin/sstDep_dramsim_r4b00b22.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# !/bin/bash
# sstDep_dramsim_r4b00b22.sh

# Description:
# Description:

# A bash script containing functions to process SST's DRAMSim
# dependency.
Expand Down Expand Up @@ -57,7 +57,7 @@ sstDepsStage_dramsim ()
pushd ${SST_DEPS_SRC_STAGED_DRAMSIM}

git reset --hard 4b00b228abaa9d9dcd27ffbb48cfa71db53d520f

# local dramsimHeadRevision=`git log -1 HEAD | head -1`
popd
sstDepsAnnounce -h $FUNCNAME -m "Fetched DRAMSim2 rev 4b00b228abaa9d9dcd27ffbb48cfa71db53d520f"
Expand Down
2 changes: 1 addition & 1 deletion buildsys/deps/bin/sstDep_dramsim_stabledevel.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# !/bin/bash
# sstDep_dramsim_stabledevel.sh

# Description:
# Description:

# A bash script containing functions to process SST's DRAMSim
# dependency.
Expand Down
2 changes: 1 addition & 1 deletion buildsys/deps/bin/sstDep_dramsim_static.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# !/bin/bash
# sstDep_dramsim_static.sh

# Description:
# Description:

# A bash script containing functions to process SST's DRAMSim
# dependency.
Expand Down
2 changes: 1 addition & 1 deletion buildsys/deps/bin/sstDep_dramsim_v2.2.1.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# !/bin/bash
# sstDep_dramsim_v2.2.1.sh

# Description:
# Description:

# A bash script containing functions to process SST's DRAMSim
# dependency.
Expand Down
4 changes: 2 additions & 2 deletions buildsys/deps/bin/sstDep_dramsim_v2.2.2.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# !/bin/bash
# sstDep_dramsim_v2.2.2.sh

# Description:
# Description:

# A bash script containing functions to process SST's DRAMSim
# dependency.
Expand Down Expand Up @@ -117,7 +117,7 @@ CXX=clang++\
# if using Intel compiler
if [[ ${compiler} =~ icpc.* ]]
then
# patch Makefile for Intel compiler on Linux
# patch Makefile for Intel compiler on Linux
echo "INFO: (${FUNCNAME}) Intel compiler detected in CXX. Patching Makefile for icc/icpc..."
sed -i.bak1 -e 's/g++/$(CXX)/' Makefile
# I know the alignment looks awful here.
Expand Down
2 changes: 1 addition & 1 deletion buildsys/deps/bin/sstDep_dramsim_v2.2.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# !/bin/bash
# sstDep_dramsim_v2.2.sh

# Description:
# Description:

# A bash script containing functions to process SST's DRAMSim
# dependency.
Expand Down
20 changes: 10 additions & 10 deletions buildsys/deps/bin/sstDep_goblin_hmcsim_stabledevel.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# !/bin/bash
# sstDep_goblin_hmcsim_stabledevel.sh

# Description:
# Description:

# A bash script containing functions to process SST's Goblin_HMCSIM
# dependency.
Expand All @@ -28,15 +28,15 @@ export SST_BUILD_GOBLIN_HMCSIM_STABLEDEVEL=1
# Outputs:
# Pass/fail
# Expected Results
# Staged Goblin_HMCSIM code
# Staged Goblin_HMCSIM code
# Caveats:
# None
#-------------------------------------------------------------------------------
export SST_DEPS_SRC_STAGED_GOBLIN_HMCSIM=${SST_DEPS_SRC_STAGING}/goblin_hmcsim
sstDepsStage_goblin_hmcsim ()
{
sstDepsAnnounce -h $FUNCNAME -m "Staging goblin_hmcsim stabledevel"

pushd ${SST_DEPS_SRC_STAGING}

Num_Tries_remaing=3
Expand All @@ -61,7 +61,7 @@ sstDepsStage_goblin_hmcsim ()
return $retVal
fi
done

if [ $retVal -ne 0 ] # retVal from git clone
then
# bail out on error
Expand All @@ -71,7 +71,7 @@ sstDepsStage_goblin_hmcsim ()
popd
return $retVal
fi

# Move into the goblin_hmcsim directory
pushd ${SST_DEPS_SRC_STAGED_GOBLIN_HMCSIM}
echo "gc64-hmcsim.git" `git log HEAD | sed 4q` >&2
Expand Down Expand Up @@ -102,7 +102,7 @@ sstDepsDeploy_goblin_hmcsim ()
pushd ${SST_DEPS_SRC_STAGED_GOBLIN_HMCSIM}

# Build and install GOBLIN_HMCSIM
make
make
retval=$?
if [ $retval -ne 0 ]
then
Expand All @@ -111,18 +111,18 @@ sstDepsDeploy_goblin_hmcsim ()
popd
return $retval
fi

popd
# NOTE: There is no "make install" for Goblin_HMCSIM. Instead make a

# NOTE: There is no "make install" for Goblin_HMCSIM. Instead make a
# link to the compilied directory
if [ ! -d ${SST_DEPS_INSTALL_DEPS}/packages ]
then
mkdir -p ${SST_DEPS_INSTALL_DEPS}/packages
fi

ln -s ${SST_DEPS_SRC_STAGED_GOBLIN_HMCSIM} ${SST_DEPS_INSTALL_DEPS}/packages/Goblin_HMCSIM

}

# Installation location as used by SST's "./configure --with-goblin_hmcsim=..."
Expand Down
22 changes: 11 additions & 11 deletions buildsys/deps/bin/sstDep_hbm_dramsim2_stabledevel.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# !/bin/bash
# sstDep_hbm_dramsim2_stabledevel.sh

# Description:
# Description:

# A bash script containing functions to process SST's HBM_DRAMSim2
# dependency.
Expand All @@ -28,15 +28,15 @@ export SST_BUILD_HBM_DRAMSIM2_STABLEDEVEL=1
# Outputs:
# Pass/fail
# Expected Results
# Staged HBM_DRAMSim2 code
# Staged HBM_DRAMSim2 code
# Caveats:
# None
#-------------------------------------------------------------------------------
export SST_DEPS_SRC_STAGED_HBM_DRAMSIM2=${SST_DEPS_SRC_STAGING}/hbm_dramsim2
sstDepsStage_hbm_dramsim2 ()
{
sstDepsAnnounce -h $FUNCNAME -m "Staging hbm_dramsim2 stabledevel"

pushd ${SST_DEPS_SRC_STAGING}

Num_Tries_remaing=3
Expand All @@ -45,7 +45,7 @@ sstDepsStage_hbm_dramsim2 ()
echo " "
echo "git clone https://github.com/tactcomplabs/HBM.git hbm_dramsim2"
git clone https://github.com/tactcomplabs/HBM.git hbm_dramsim2

retVal=$?
if [ $retVal == 0 ] ; then
Num_Tries_remaing=-1
Expand All @@ -69,12 +69,12 @@ sstDepsStage_hbm_dramsim2 ()
popd
return $retval
fi

# Move into the hbm_dramsim2 directory
pushd ${SST_DEPS_SRC_STAGED_HBM_DRAMSIM2}
git checkout hbm-1.0.0-release


echo "HBM.git" `git log HEAD | sed 4q` >&2

popd
Expand Down Expand Up @@ -103,7 +103,7 @@ sstDepsDeploy_hbm_dramsim2 ()
pushd ${SST_DEPS_SRC_STAGED_HBM_DRAMSIM2}

# Build and install HBM_DRAMSIM2
make
make
retval=$?
if [ $retval -ne 0 ]
then
Expand All @@ -112,18 +112,18 @@ sstDepsDeploy_hbm_dramsim2 ()
popd
return $retval
fi

popd
# NOTE: There is no "make install" for HBM_DRAMSim2. Instead make a

# NOTE: There is no "make install" for HBM_DRAMSim2. Instead make a
# link to the compilied directory
if [ ! -d ${SST_DEPS_INSTALL_DEPS}/packages ]
then
mkdir -p ${SST_DEPS_INSTALL_DEPS}/packages
fi

ln -s ${SST_DEPS_SRC_STAGED_HBM_DRAMSIM2} ${SST_DEPS_INSTALL_DEPS}/packages/HBM_DRAMSim2

}

# Installation location as used by SST's "./configure --with-hbmdramsim=..."
Expand Down
4 changes: 2 additions & 2 deletions buildsys/deps/bin/sstDep_hybridsim.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# !/bin/bash
# sstDep_hybridsim.sh

# Description:
# Description:

# A bash script containing functions to process SST's HybridSim
# dependency.
Expand Down Expand Up @@ -143,7 +143,7 @@ CXX=clang++\
# if using Intel compiler
if [[ ${compiler} =~ icpc.* ]]
then
# patch Makefile for Intel compiler on Linux
# patch Makefile for Intel compiler on Linux
echo "INFO: (${FUNCNAME}) Intel compiler detected in CXX. Patching Makefile for icc/icpc..."
sed -i.bak1 -e 's/g++/$(CXX)/' Makefile
# I know the alignment looks awful here.
Expand Down
6 changes: 3 additions & 3 deletions buildsys/deps/bin/sstDep_nvdimmsim.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

# sstDep_nvdimmsim.sh

# Description:
# Description:

# A bash script containing functions to process SST's NVDIMMSim
# dependency.
Expand Down Expand Up @@ -40,7 +40,7 @@ sstDepsStage_nvdimmsim ()


# New May 5, 2014 using 2.0.0 release

tarFile="NVDIMMSim-2.0.0.tar.gz"
sstDepsAnnounce -h $FUNCNAME -m "Staging ${tarFile}."

Expand Down Expand Up @@ -119,7 +119,7 @@ sstDepsDeploy_nvdimmsim ()
# if using Intel compiler
if [[ ${compiler} =~ icpc.* ]]
then
# patch Makefile for Intel compiler on Linux
# patch Makefile for Intel compiler on Linux
echo "INFO: (${FUNCNAME}) Intel compiler detected in CXX. Patching Makefile for icc/icpc..."
sed -i.bak1 -e 's/g++/$(CXX)/' Makefile
# I know the alignment looks awful here.
Expand Down
24 changes: 12 additions & 12 deletions buildsys/deps/bin/sstDep_ramulator_stabledevel.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# !/bin/bash
# sstDep_ramulator_stabledevel.sh

# Description:
# Description:

# A bash script containing functions to process SST's Ramulator
# dependency.
Expand All @@ -28,15 +28,15 @@ export SST_BUILD_RAMULATOR_STABLEDEVEL=1
# Outputs:
# Pass/fail
# Expected Results
# Staged Ramulator code
# Staged Ramulator code
# Caveats:
# None
#-------------------------------------------------------------------------------
export SST_DEPS_SRC_STAGED_RAMULATOR=${SST_DEPS_SRC_STAGING}/ramulator
sstDepsStage_ramulator ()
{
sstDepsAnnounce -h $FUNCNAME -m "Staging ramulator stabledevel"

pushd ${SST_DEPS_SRC_STAGING}

Num_Tries_remaing=3
Expand Down Expand Up @@ -65,7 +65,7 @@ sstDepsStage_ramulator ()
fi
done
echo " "

if [ $retVal -ne 0 ] ## retVal from git clone
then
# bail out on error
Expand All @@ -75,17 +75,17 @@ sstDepsStage_ramulator ()
popd
return $retVal
fi

# Move into the ramulator directory
pushd ${SST_DEPS_SRC_STAGED_RAMULATOR}
git checkout 7d2e72306c6079768e11a1867eb67b60cee34a1c
echo "ramulator.git" `git log HEAD | sed 4q` >&2

# NOTE: There are 2 patches to be applied to this sha = 7d2e72 to get
# NOTE: There are 2 patches to be applied to this sha = 7d2e72 to get
# ramulator library to build properly on gcc
# ramulator_gcc48Patch.patch - Fixes compile for gcc 4.8
# ramulator_libPatch.patch - Adds library build for gcc

popd
popd
}
Expand Down Expand Up @@ -120,7 +120,7 @@ sstDepsDeploy_ramulator ()
# Linux
make CXX=g++ libramulator.so
fi

retval=$?
if [ $retval -ne 0 ]
then
Expand All @@ -129,18 +129,18 @@ sstDepsDeploy_ramulator ()
popd
return $retval
fi

popd
# NOTE: There is no "make install" for Ramulator. Instead make a

# NOTE: There is no "make install" for Ramulator. Instead make a
# link to the compilied directory
if [ ! -d ${SST_DEPS_INSTALL_DEPS}/packages ]
then
mkdir -p ${SST_DEPS_INSTALL_DEPS}/packages
fi

ln -s ${SST_DEPS_SRC_STAGED_RAMULATOR} ${SST_DEPS_INSTALL_DEPS}/packages/Ramulator

}

# Installation location as used by SST's "./configure --with-ramulator=..."
Expand Down
2 changes: 0 additions & 2 deletions test/testSuites/testcuda/MakefileVecAdd
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,3 @@ all: vectorAdd

clean:
rm vectorAdd.160k vectorAdd.o


Loading

0 comments on commit 1fbf9b9

Please sign in to comment.