integrating recent changes from fermi-test into fermi

(i'll use "fermi" for more disruptive changes to the pipeline model such
as updating the MSHRs and getting rid of the warp tracker, ripping out DWF, etc...)

[git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 7805]

1 files changed, 0 insertions, 86 deletions

diff --git a/benchmarks/CUDA/RAY/EasyBMP.h b/benchmarks/CUDA/RAY/EasyBMP.h
deleted file mode 100644
index ead98c1..0000000
--- a/benchmarks/CUDA/RAY/EasyBMP.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*************************************************
-*                                                *
-*  EasyBMP Cross-Platform Windows Bitmap Library * 
-*                                                *
-*  Author: Paul Macklin                          *
-*   email: [email protected]       *
-* support: http://easybmp.sourceforge.net        *
-*                                                *
-*          file: EasyBMP.h                       * 
-*    date added: 01-31-2005                      *
-* date modified: 12-01-2006                      *
-*       version: 1.06                            *
-*                                                *
-*   License: BSD (revised/modified)              *
-* Copyright: 2005-6 by the EasyBMP Project       * 
-*                                                *
-* description: Main include file                 *
-*                                                *
-*************************************************/
-
-#ifdef _MSC_VER 
-// MS Visual Studio gives warnings when using 
-// fopen. But fopen_s is not going to work well 
-// with most compilers, and fopen_s uses different 
-// syntax than fopen. (i.e., a macro won't work) 
-// So, we'lll use this:
-#define _CRT_SECURE_NO_DEPRECATE
-#endif
-
-#include <iostream>
-#include <cmath>
-#include <cctype>
-#include <cstring>
-
-#ifndef EasyBMP
-#define EasyBMP
-
-#ifdef __BCPLUSPLUS__ 
-// The Borland compiler must use this because something
-// is wrong with their cstdio file. 
-#include <stdio.h>
-#else 
-#include <cstdio>
-#endif
-
-#ifdef __GNUC__
-// If g++ specific code is ever required, this is 
-// where it goes. 
-#endif
-
-#ifdef __INTEL_COMPILER
-// If Intel specific code is ever required, this is 
-// where it goes. 
-#endif
-
-#ifndef _DefaultXPelsPerMeter_
-#define _DefaultXPelsPerMeter_
-#define DefaultXPelsPerMeter 3780
-// set to a default of 96 dpi 
-#endif
-
-#ifndef _DefaultYPelsPerMeter_
-#define _DefaultYPelsPerMeter_
-#define DefaultYPelsPerMeter 3780
-// set to a default of 96 dpi
-#endif
-
-#include "EasyBMP_DataStructures.h"
-#include "EasyBMP_BMP.h"
-#include "EasyBMP_VariousBMPutilities.h"
-
-#ifndef _EasyBMP_Version_
-#define _EasyBMP_Version_ 1.06
-#define _EasyBMP_Version_Integer_ 106
-#define _EasyBMP_Version_String_ "1.06"
-#endif
-
-#ifndef _EasyBMPwarnings_
-#define _EasyBMPwarnings_
-#endif
-
-void SetEasyBMPwarningsOff( void );
-void SetEasyBMPwarningsOn( void );
-bool GetEasyBMPwarningState( void );
-
-#endif