From f73d71935122aaef2e32e8c34f1004864d05c934 Mon Sep 17 00:00:00 2001 From: Tor Aamodt Date: Fri, 27 Jul 2012 08:48:33 -0800 Subject: also print out build number (perforce change list) [git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 13556] --- Makefile | 2 +- setup_environment | 3 ++- version_detection.mk | 3 +++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 7f0897a..23a34b0 100644 --- a/Makefile +++ b/Makefile @@ -86,7 +86,7 @@ check_setup_environment: echo ""; \ exit 102; \ else \ - echo; echo -n " Building GPGPU-Sim version "; cat version | awk '/Version/ {print $$8}'; echo " on CUDA version $(CUDA_VERSION_STRING)"; echo; \ + echo; echo " Building GPGPU-Sim version $(GPGPUSIM_VERSION) (build $(GPGPUSIM_BUILD)) with CUDA version $(CUDA_VERSION_STRING)"; echo; \ true; \ fi \ fi diff --git a/setup_environment b/setup_environment index 094e427..f20118e 100644 --- a/setup_environment +++ b/setup_environment @@ -4,7 +4,8 @@ export GPGPUSIM_SETUP_ENVIRONMENT_WAS_RUN= export GPGPUSIM_ROOT="$( cd "$( dirname "$BASH_SOURCE" )" && pwd )" GPGPUSIM_VERSION_STRING=`cat $GPGPUSIM_ROOT/version | awk '/Version/ {print $8}'` -echo "GPGPU-Sim version $GPGPUSIM_VERSION_STRING"; +GPGPUSIM_BUILD_STRING=`cat $GPGPUSIM_ROOT/version | awk '/Change/ {print $6}'` +echo "GPGPU-Sim version $GPGPUSIM_VERSION_STRING (build $GPGPUSIM_BUILD_STRING)"; if [ ! -n "$CUDA_INSTALL_PATH" ]; then echo "ERROR ** Install CUDA Toolkit and set CUDA_INSTALL_PATH."; diff --git a/version_detection.mk b/version_detection.mk index 3824866..eac96e0 100644 --- a/version_detection.mk +++ b/version_detection.mk @@ -26,6 +26,9 @@ # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# Detect GPGPU-Sim Version +GPGPUSIM_VERSION=$(shell cat $(GPGPUSIM_ROOT)/version | awk '/Version/ {print $$8}' ) +GPGPUSIM_BUILD=$(shell cat $(GPGPUSIM_ROOT)/version | awk '/Change/ {print $$6}' ) # Detect CUDA Runtime Version CUDA_VERSION_STRING:=$(shell $(CUDA_INSTALL_PATH)/bin/nvcc --version | awk '/release/ {print $$5;}' | sed 's/,//') -- cgit v1.3