diff --git a/benchmark/asum.c b/benchmark/asum.c index 0cf70f949..46ed3ef60 100644 --- a/benchmark/asum.c +++ b/benchmark/asum.c @@ -25,12 +25,8 @@ 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. *****************************************************************************/ -#ifdef __CYGWIN32__ -#include -#endif #include "common.h" - #undef ASUM #ifdef COMPLEX diff --git a/benchmark/axpy.c b/benchmark/axpy.c index f081e15f0..7a09085c5 100644 --- a/benchmark/axpy.c +++ b/benchmark/axpy.c @@ -25,12 +25,8 @@ 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. *****************************************************************************/ -#ifdef __CYGWIN32__ -#include -#endif #include "common.h" - #undef AXPY #ifdef COMPLEX diff --git a/benchmark/cholesky.c b/benchmark/cholesky.c index 7925ce082..088585c2d 100644 --- a/benchmark/cholesky.c +++ b/benchmark/cholesky.c @@ -36,9 +36,6 @@ /* or implied, of The University of Texas at Austin. */ /*********************************************************************/ -#ifdef __CYGWIN32__ -#include -#endif #include "common.h" double fabs(double); diff --git a/benchmark/copy.c b/benchmark/copy.c index 65ff0ae33..41ea4740a 100644 --- a/benchmark/copy.c +++ b/benchmark/copy.c @@ -25,12 +25,8 @@ 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. *****************************************************************************/ -#ifdef __CYGWIN32__ -#include -#endif #include "common.h" - #undef COPY #ifdef COMPLEX diff --git a/benchmark/dot.c b/benchmark/dot.c index afa016d57..2ea7a4a69 100644 --- a/benchmark/dot.c +++ b/benchmark/dot.c @@ -25,22 +25,16 @@ 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. *****************************************************************************/ -#ifdef __CYGWIN32__ -#include -#endif #include "common.h" - #undef DOT - #ifdef DOUBLE #define DOT BLASFUNC(ddot) #else #define DOT BLASFUNC(sdot) #endif - #if defined(__WIN32__) || defined(__WIN64__) #ifndef DELTA_EPOCH_IN_MICROSECS diff --git a/benchmark/geev.c b/benchmark/geev.c index 92eb86f78..7cedec44f 100644 --- a/benchmark/geev.c +++ b/benchmark/geev.c @@ -36,12 +36,8 @@ /* or implied, of The University of Texas at Austin. */ /*********************************************************************/ -#ifdef __CYGWIN32__ -#include -#endif #include "common.h" - #undef GEEV #ifndef COMPLEX diff --git a/benchmark/gemm.c b/benchmark/gemm.c index 885455086..4cc3322c5 100644 --- a/benchmark/gemm.c +++ b/benchmark/gemm.c @@ -25,12 +25,8 @@ 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. *****************************************************************************/ -#ifdef __CYGWIN32__ -#include -#endif #include "common.h" - #undef GEMM #ifndef COMPLEX diff --git a/benchmark/gemm3m.c b/benchmark/gemm3m.c index 96fedb588..22714b821 100644 --- a/benchmark/gemm3m.c +++ b/benchmark/gemm3m.c @@ -25,12 +25,8 @@ 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. *****************************************************************************/ -#ifdef __CYGWIN32__ -#include -#endif #include "common.h" - #undef GEMM #ifndef COMPLEX diff --git a/benchmark/gemv.c b/benchmark/gemv.c index f5afcd53c..2a2a2c829 100644 --- a/benchmark/gemv.c +++ b/benchmark/gemv.c @@ -25,12 +25,8 @@ 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. *****************************************************************************/ -#ifdef __CYGWIN32__ -#include -#endif #include "common.h" - #undef GEMV #ifndef COMPLEX diff --git a/benchmark/ger.c b/benchmark/ger.c index a54545171..5ac660775 100644 --- a/benchmark/ger.c +++ b/benchmark/ger.c @@ -25,12 +25,8 @@ 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. *****************************************************************************/ -#ifdef __CYGWIN32__ -#include -#endif #include "common.h" - #undef GER #ifdef COMPLEX @@ -47,7 +43,6 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #endif #endif - #if defined(__WIN32__) || defined(__WIN64__) #ifndef DELTA_EPOCH_IN_MICROSECS diff --git a/benchmark/gesv.c b/benchmark/gesv.c index 369da4436..50ed34a6b 100644 --- a/benchmark/gesv.c +++ b/benchmark/gesv.c @@ -36,9 +36,6 @@ /* or implied, of The University of Texas at Austin. */ /*********************************************************************/ -#ifdef __CYGWIN32__ -#include -#endif #include "common.h" double fabs(double); diff --git a/benchmark/getri.c b/benchmark/getri.c index 8b17b331a..93fca9dae 100644 --- a/benchmark/getri.c +++ b/benchmark/getri.c @@ -36,9 +36,6 @@ /* or implied, of The University of Texas at Austin. */ /*********************************************************************/ -#ifdef __CYGWIN32__ -#include -#endif #include "common.h" #undef GETRF diff --git a/benchmark/hemm.c b/benchmark/hemm.c index b7f0c87ad..65d33252b 100644 --- a/benchmark/hemm.c +++ b/benchmark/hemm.c @@ -25,12 +25,8 @@ 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. *****************************************************************************/ -#ifdef __CYGWIN32__ -#include -#endif #include "common.h" - #undef HEMM #ifdef DOUBLE @@ -39,7 +35,6 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define HEMM BLASFUNC(chemm) #endif - #if defined(__WIN32__) || defined(__WIN64__) #ifndef DELTA_EPOCH_IN_MICROSECS diff --git a/benchmark/hemv.c b/benchmark/hemv.c index b12ba8c74..a05c77e0c 100644 --- a/benchmark/hemv.c +++ b/benchmark/hemv.c @@ -25,22 +25,16 @@ 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. *****************************************************************************/ -#ifdef __CYGWIN32__ -#include -#endif #include "common.h" - #undef HEMV - #ifdef DOUBLE #define HEMV BLASFUNC(zhemv) #else #define HEMV BLASFUNC(chemv) #endif - #if defined(__WIN32__) || defined(__WIN64__) #ifndef DELTA_EPOCH_IN_MICROSECS diff --git a/benchmark/her2k.c b/benchmark/her2k.c index 4209e04e6..d8225e564 100644 --- a/benchmark/her2k.c +++ b/benchmark/her2k.c @@ -25,12 +25,8 @@ 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. *****************************************************************************/ -#ifdef __CYGWIN32__ -#include -#endif #include "common.h" - #undef HER2K #ifdef DOUBLE #define HER2K BLASFUNC(zher2k) @@ -38,7 +34,6 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define HER2K BLASFUNC(cher2k) #endif - #if defined(__WIN32__) || defined(__WIN64__) #ifndef DELTA_EPOCH_IN_MICROSECS diff --git a/benchmark/herk.c b/benchmark/herk.c index 8eee1d3a5..dd3530d0a 100644 --- a/benchmark/herk.c +++ b/benchmark/herk.c @@ -25,22 +25,16 @@ 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. *****************************************************************************/ -#ifdef __CYGWIN32__ -#include -#endif #include "common.h" - #undef HERK - #ifdef DOUBLE #define HERK BLASFUNC(zherk) #else #define HERK BLASFUNC(cherk) #endif - #if defined(__WIN32__) || defined(__WIN64__) #ifndef DELTA_EPOCH_IN_MICROSECS diff --git a/benchmark/iamax.c b/benchmark/iamax.c index fb8a00d31..ac206e3f2 100644 --- a/benchmark/iamax.c +++ b/benchmark/iamax.c @@ -25,12 +25,8 @@ 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. *****************************************************************************/ -#ifdef __CYGWIN32__ -#include -#endif #include "common.h" - #undef IAMAX #ifdef COMPLEX diff --git a/benchmark/linpack.c b/benchmark/linpack.c index 317321f25..1ca87fbe3 100644 --- a/benchmark/linpack.c +++ b/benchmark/linpack.c @@ -36,9 +36,6 @@ /* or implied, of The University of Texas at Austin. */ /*********************************************************************/ -#ifdef __CYGWIN32__ -#include -#endif #include "common.h" double fabs(double); diff --git a/benchmark/nrm2.c b/benchmark/nrm2.c index 621013ae8..99d339698 100644 --- a/benchmark/nrm2.c +++ b/benchmark/nrm2.c @@ -25,12 +25,8 @@ 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. *****************************************************************************/ -#ifdef __CYGWIN32__ -#include -#endif #include "common.h" - #undef NRM2 #ifdef COMPLEX diff --git a/benchmark/potrf.c b/benchmark/potrf.c index 42457b651..e45561ce4 100644 --- a/benchmark/potrf.c +++ b/benchmark/potrf.c @@ -36,9 +36,6 @@ /* or implied, of The University of Texas at Austin. */ /*********************************************************************/ -#ifdef __CYGWIN32__ -#include -#endif #include "common.h" double fabs(double); diff --git a/benchmark/rot.c b/benchmark/rot.c index 5608a77fa..f76a71256 100644 --- a/benchmark/rot.c +++ b/benchmark/rot.c @@ -25,22 +25,16 @@ 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. *****************************************************************************/ -#ifdef __CYGWIN32__ -#include -#endif #include "common.h" - #undef DOT - #ifdef DOUBLE #define ROT BLASFUNC(drot) #else #define ROT BLASFUNC(srot) #endif - #if defined(__WIN32__) || defined(__WIN64__) #ifndef DELTA_EPOCH_IN_MICROSECS diff --git a/benchmark/scal.c b/benchmark/scal.c index 60ce0d90b..3ab4db1c1 100644 --- a/benchmark/scal.c +++ b/benchmark/scal.c @@ -25,12 +25,8 @@ 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. *****************************************************************************/ -#ifdef __CYGWIN32__ -#include -#endif #include "common.h" - #undef SCAL #ifdef COMPLEX diff --git a/benchmark/swap.c b/benchmark/swap.c index 2216ca5cf..a9c580d70 100644 --- a/benchmark/swap.c +++ b/benchmark/swap.c @@ -25,12 +25,8 @@ 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. *****************************************************************************/ -#ifdef __CYGWIN32__ -#include -#endif #include "common.h" - #undef SWAP #ifdef COMPLEX diff --git a/benchmark/symm.c b/benchmark/symm.c index d35761585..604db3078 100644 --- a/benchmark/symm.c +++ b/benchmark/symm.c @@ -25,12 +25,8 @@ 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. *****************************************************************************/ -#ifdef __CYGWIN32__ -#include -#endif #include "common.h" - #undef SYMM #ifndef COMPLEX diff --git a/benchmark/symv.c b/benchmark/symv.c index 25e80a99c..8c6bcc1d2 100644 --- a/benchmark/symv.c +++ b/benchmark/symv.c @@ -25,12 +25,8 @@ 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. *****************************************************************************/ -#ifdef __CYGWIN32__ -#include -#endif #include "common.h" - #undef SYMV #ifndef COMPLEX diff --git a/benchmark/syr2k.c b/benchmark/syr2k.c index 02521c6bc..4ad2073ba 100644 --- a/benchmark/syr2k.c +++ b/benchmark/syr2k.c @@ -25,12 +25,8 @@ 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. *****************************************************************************/ -#ifdef __CYGWIN32__ -#include -#endif #include "common.h" - #undef SYR2K #ifndef COMPLEX diff --git a/benchmark/syrk.c b/benchmark/syrk.c index cf4f25dd1..f230c1d44 100644 --- a/benchmark/syrk.c +++ b/benchmark/syrk.c @@ -25,12 +25,8 @@ 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. *****************************************************************************/ -#ifdef __CYGWIN32__ -#include -#endif #include "common.h" - #undef SYRK #ifndef COMPLEX diff --git a/benchmark/trmm.c b/benchmark/trmm.c index 4d43d6b11..a0cdfd18a 100644 --- a/benchmark/trmm.c +++ b/benchmark/trmm.c @@ -25,12 +25,8 @@ 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. *****************************************************************************/ -#ifdef __CYGWIN32__ -#include -#endif #include "common.h" - #undef TRMM #ifndef COMPLEX diff --git a/benchmark/trsm.c b/benchmark/trsm.c index f8006fb25..833bd095a 100644 --- a/benchmark/trsm.c +++ b/benchmark/trsm.c @@ -25,12 +25,8 @@ 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. *****************************************************************************/ -#ifdef __CYGWIN32__ -#include -#endif #include "common.h" - #undef TRSM #ifndef COMPLEX diff --git a/benchmark/zdot-intel.c b/benchmark/zdot-intel.c index 2550ee0db..87f72f8bc 100644 --- a/benchmark/zdot-intel.c +++ b/benchmark/zdot-intel.c @@ -25,23 +25,17 @@ 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. *****************************************************************************/ -#ifdef __CYGWIN32__ -#include -#endif #define RETURN_BY_STACK 1 #include "common.h" - #undef DOT - #ifdef DOUBLE #define DOT BLASFUNC(zdotu) #else #define DOT BLASFUNC(cdotu) #endif - #if defined(__WIN32__) || defined(__WIN64__) #ifndef DELTA_EPOCH_IN_MICROSECS diff --git a/benchmark/zdot.c b/benchmark/zdot.c index a22ab2570..bc69620d6 100644 --- a/benchmark/zdot.c +++ b/benchmark/zdot.c @@ -25,22 +25,16 @@ 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. *****************************************************************************/ -#ifdef __CYGWIN32__ -#include -#endif #include "common.h" - #undef DOT - #ifdef DOUBLE #define DOT BLASFUNC(zdotu) #else #define DOT BLASFUNC(cdotu) #endif - #if defined(__WIN32__) || defined(__WIN64__) #ifndef DELTA_EPOCH_IN_MICROSECS diff --git a/driver/others/blas_server.c b/driver/others/blas_server.c index 6a25e2d07..f8bd6c8b0 100644 --- a/driver/others/blas_server.c +++ b/driver/others/blas_server.c @@ -74,7 +74,6 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include #include -#include #endif #ifndef likely diff --git a/driver/others/memory.c b/driver/others/memory.c index 54c2fbef7..2fe288127 100644 --- a/driver/others/memory.c +++ b/driver/others/memory.c @@ -119,7 +119,6 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include #include -#include #include #endif @@ -1613,7 +1612,6 @@ void gotoblas_dummy_for_PGI(void) { #include #include #include -#include #include #endif