diff --git a/CMakeLists.txt b/CMakeLists.txt index a1c78e63b..35bd10492 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,9 @@ cmake_minimum_required(VERSION 2.8.10) +if(WIN32) + SET(CMAKE_FIND_LIBRARY_PREFIXES "") + SET(CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".dll") +endif() # Add visibility of headers file( GLOB_RECURSE MAKE_HEADERS_VISIBLE_SRC *.cpp *.hpp *.h) add_custom_target( MAKE_HEADERS_VISIBLE SOURCES ${MAKE_HEADERS_VISIBLE_SRC} ) diff --git a/include/isaac/array.h b/include/isaac/array.h index 514ea8ab0..12b50b227 100644 --- a/include/isaac/array.h +++ b/include/isaac/array.h @@ -225,8 +225,8 @@ array_expression OPNAME(array_expression const & M, int_t axis = -1); ISAAC_DECLARE_DOT(sum) ISAAC_DECLARE_DOT(argmax) -ISAAC_DECLARE_DOT(max) -ISAAC_DECLARE_DOT(min) +ISAAC_DECLARE_DOT((max)) +ISAAC_DECLARE_DOT((min)) ISAAC_DECLARE_DOT(argmin) array_expression eye(std::size_t, std::size_t, isaac::numeric_type, driver::Context context = driver::queues.default_context()); diff --git a/include/isaac/symbolic/expression.h b/include/isaac/symbolic/expression.h index cd4db2ca4..120b0d8d6 100644 --- a/include/isaac/symbolic/expression.h +++ b/include/isaac/symbolic/expression.h @@ -21,7 +21,7 @@ namespace isaac { class array; -class repeat_infos; +struct repeat_infos; /** @brief Optimization enum for grouping operations into unary or binary operations. Just for optimization of lookups. */ enum operation_node_type_family diff --git a/include/isaac/value_scalar.h b/include/isaac/value_scalar.h index 4ad90cfa0..7ec130a75 100644 --- a/include/isaac/value_scalar.h +++ b/include/isaac/value_scalar.h @@ -124,8 +124,8 @@ ISAAC_DECLARE_BINARY_OPERATOR(value_scalar, operator <=) ISAAC_DECLARE_BINARY_OPERATOR(value_scalar, operator ==) ISAAC_DECLARE_BINARY_OPERATOR(value_scalar, operator !=) -ISAAC_DECLARE_BINARY_OPERATOR(value_scalar, max) -ISAAC_DECLARE_BINARY_OPERATOR(value_scalar, min) +ISAAC_DECLARE_BINARY_OPERATOR(value_scalar, (max)) +ISAAC_DECLARE_BINARY_OPERATOR(value_scalar, (min)) ISAAC_DECLARE_BINARY_OPERATOR(value_scalar, pow) #undef ISAAC_DECLARE_BINARY_OPERATOR diff --git a/lib/array.cpp b/lib/array.cpp index 86d874566..4c3e88d38 100644 --- a/lib/array.cpp +++ b/lib/array.cpp @@ -1,11 +1,14 @@ +#define NOMINMAX + #include +#include +#include #include "isaac/array.h" #include "isaac/exception/unknown_datatype.h" #include "isaac/model/model.h" #include "isaac/symbolic/execute.h" -#include namespace isaac { diff --git a/lib/backend/templates/axpy.cpp b/lib/backend/templates/axpy.cpp index ef6125610..e8f9fd82d 100644 --- a/lib/backend/templates/axpy.cpp +++ b/lib/backend/templates/axpy.cpp @@ -1,3 +1,5 @@ +#define NOMINMAX + #include "isaac/backend/templates/axpy.h" #include "isaac/backend/keywords.h" #include "isaac/driver/backend.h" diff --git a/lib/backend/templates/base.cpp b/lib/backend/templates/base.cpp index d3a89f934..25cf15b28 100644 --- a/lib/backend/templates/base.cpp +++ b/lib/backend/templates/base.cpp @@ -1,3 +1,5 @@ +#define NOMINMAX + #include #include "isaac/array.h" diff --git a/lib/model/rapidjson/encodings.h b/lib/model/rapidjson/encodings.h index 5c7da3e04..481f0314f 100644 --- a/lib/model/rapidjson/encodings.h +++ b/lib/model/rapidjson/encodings.h @@ -21,7 +21,7 @@ #ifndef RAPIDJSON_ENCODINGS_H_ #define RAPIDJSON_ENCODINGS_H_ -#include "rapidjson.h" +//#include "rapidjson.h" #ifdef _MSC_VER RAPIDJSON_DIAG_PUSH diff --git a/lib/model/rapidjson/msinttypes/inttypes.h b/lib/model/rapidjson/msinttypes/inttypes.h deleted file mode 100644 index ac7e32b6e..000000000 --- a/lib/model/rapidjson/msinttypes/inttypes.h +++ /dev/null @@ -1,306 +0,0 @@ -// ISO C9x compliant inttypes.h for Microsoft Visual Studio -// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 -// -// Copyright (c) 2006-2013 Alexander Chemeris -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are met: -// -// 1. Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimer. -// -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// 3. Neither the name of the product nor the names of its contributors may -// be used to endorse or promote products derived from this software -// without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -// WHETHER IN CONTRACT, STRICT LIABILITY, 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. -// -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _MSC_VER // [ -#error "Use this header only with Microsoft Visual C++ compilers!" -#endif // _MSC_VER ] - -#ifndef _MSC_INTTYPES_H_ // [ -#define _MSC_INTTYPES_H_ - -#if _MSC_VER > 1000 -#pragma once -#endif - -#include "stdint.h" - -// 7.8 Format conversion of integer types - -typedef struct { - intmax_t quot; - intmax_t rem; -} imaxdiv_t; - -// 7.8.1 Macros for format specifiers - -#if !defined(__cplusplus) || defined(__STDC_FORMAT_MACROS) // [ See footnote 185 at page 198 - -// The fprintf macros for signed integers are: -#define PRId8 "d" -#define PRIi8 "i" -#define PRIdLEAST8 "d" -#define PRIiLEAST8 "i" -#define PRIdFAST8 "d" -#define PRIiFAST8 "i" - -#define PRId16 "hd" -#define PRIi16 "hi" -#define PRIdLEAST16 "hd" -#define PRIiLEAST16 "hi" -#define PRIdFAST16 "hd" -#define PRIiFAST16 "hi" - -#define PRId32 "I32d" -#define PRIi32 "I32i" -#define PRIdLEAST32 "I32d" -#define PRIiLEAST32 "I32i" -#define PRIdFAST32 "I32d" -#define PRIiFAST32 "I32i" - -#define PRId64 "I64d" -#define PRIi64 "I64i" -#define PRIdLEAST64 "I64d" -#define PRIiLEAST64 "I64i" -#define PRIdFAST64 "I64d" -#define PRIiFAST64 "I64i" - -#define PRIdMAX "I64d" -#define PRIiMAX "I64i" - -#define PRIdPTR "Id" -#define PRIiPTR "Ii" - -// The fprintf macros for unsigned integers are: -#define PRIo8 "o" -#define PRIu8 "u" -#define PRIx8 "x" -#define PRIX8 "X" -#define PRIoLEAST8 "o" -#define PRIuLEAST8 "u" -#define PRIxLEAST8 "x" -#define PRIXLEAST8 "X" -#define PRIoFAST8 "o" -#define PRIuFAST8 "u" -#define PRIxFAST8 "x" -#define PRIXFAST8 "X" - -#define PRIo16 "ho" -#define PRIu16 "hu" -#define PRIx16 "hx" -#define PRIX16 "hX" -#define PRIoLEAST16 "ho" -#define PRIuLEAST16 "hu" -#define PRIxLEAST16 "hx" -#define PRIXLEAST16 "hX" -#define PRIoFAST16 "ho" -#define PRIuFAST16 "hu" -#define PRIxFAST16 "hx" -#define PRIXFAST16 "hX" - -#define PRIo32 "I32o" -#define PRIu32 "I32u" -#define PRIx32 "I32x" -#define PRIX32 "I32X" -#define PRIoLEAST32 "I32o" -#define PRIuLEAST32 "I32u" -#define PRIxLEAST32 "I32x" -#define PRIXLEAST32 "I32X" -#define PRIoFAST32 "I32o" -#define PRIuFAST32 "I32u" -#define PRIxFAST32 "I32x" -#define PRIXFAST32 "I32X" - -#define PRIo64 "I64o" -#define PRIu64 "I64u" -#define PRIx64 "I64x" -#define PRIX64 "I64X" -#define PRIoLEAST64 "I64o" -#define PRIuLEAST64 "I64u" -#define PRIxLEAST64 "I64x" -#define PRIXLEAST64 "I64X" -#define PRIoFAST64 "I64o" -#define PRIuFAST64 "I64u" -#define PRIxFAST64 "I64x" -#define PRIXFAST64 "I64X" - -#define PRIoMAX "I64o" -#define PRIuMAX "I64u" -#define PRIxMAX "I64x" -#define PRIXMAX "I64X" - -#define PRIoPTR "Io" -#define PRIuPTR "Iu" -#define PRIxPTR "Ix" -#define PRIXPTR "IX" - -// The fscanf macros for signed integers are: -#define SCNd8 "d" -#define SCNi8 "i" -#define SCNdLEAST8 "d" -#define SCNiLEAST8 "i" -#define SCNdFAST8 "d" -#define SCNiFAST8 "i" - -#define SCNd16 "hd" -#define SCNi16 "hi" -#define SCNdLEAST16 "hd" -#define SCNiLEAST16 "hi" -#define SCNdFAST16 "hd" -#define SCNiFAST16 "hi" - -#define SCNd32 "ld" -#define SCNi32 "li" -#define SCNdLEAST32 "ld" -#define SCNiLEAST32 "li" -#define SCNdFAST32 "ld" -#define SCNiFAST32 "li" - -#define SCNd64 "I64d" -#define SCNi64 "I64i" -#define SCNdLEAST64 "I64d" -#define SCNiLEAST64 "I64i" -#define SCNdFAST64 "I64d" -#define SCNiFAST64 "I64i" - -#define SCNdMAX "I64d" -#define SCNiMAX "I64i" - -#ifdef _WIN64 // [ -# define SCNdPTR "I64d" -# define SCNiPTR "I64i" -#else // _WIN64 ][ -# define SCNdPTR "ld" -# define SCNiPTR "li" -#endif // _WIN64 ] - -// The fscanf macros for unsigned integers are: -#define SCNo8 "o" -#define SCNu8 "u" -#define SCNx8 "x" -#define SCNX8 "X" -#define SCNoLEAST8 "o" -#define SCNuLEAST8 "u" -#define SCNxLEAST8 "x" -#define SCNXLEAST8 "X" -#define SCNoFAST8 "o" -#define SCNuFAST8 "u" -#define SCNxFAST8 "x" -#define SCNXFAST8 "X" - -#define SCNo16 "ho" -#define SCNu16 "hu" -#define SCNx16 "hx" -#define SCNX16 "hX" -#define SCNoLEAST16 "ho" -#define SCNuLEAST16 "hu" -#define SCNxLEAST16 "hx" -#define SCNXLEAST16 "hX" -#define SCNoFAST16 "ho" -#define SCNuFAST16 "hu" -#define SCNxFAST16 "hx" -#define SCNXFAST16 "hX" - -#define SCNo32 "lo" -#define SCNu32 "lu" -#define SCNx32 "lx" -#define SCNX32 "lX" -#define SCNoLEAST32 "lo" -#define SCNuLEAST32 "lu" -#define SCNxLEAST32 "lx" -#define SCNXLEAST32 "lX" -#define SCNoFAST32 "lo" -#define SCNuFAST32 "lu" -#define SCNxFAST32 "lx" -#define SCNXFAST32 "lX" - -#define SCNo64 "I64o" -#define SCNu64 "I64u" -#define SCNx64 "I64x" -#define SCNX64 "I64X" -#define SCNoLEAST64 "I64o" -#define SCNuLEAST64 "I64u" -#define SCNxLEAST64 "I64x" -#define SCNXLEAST64 "I64X" -#define SCNoFAST64 "I64o" -#define SCNuFAST64 "I64u" -#define SCNxFAST64 "I64x" -#define SCNXFAST64 "I64X" - -#define SCNoMAX "I64o" -#define SCNuMAX "I64u" -#define SCNxMAX "I64x" -#define SCNXMAX "I64X" - -#ifdef _WIN64 // [ -# define SCNoPTR "I64o" -# define SCNuPTR "I64u" -# define SCNxPTR "I64x" -# define SCNXPTR "I64X" -#else // _WIN64 ][ -# define SCNoPTR "lo" -# define SCNuPTR "lu" -# define SCNxPTR "lx" -# define SCNXPTR "lX" -#endif // _WIN64 ] - -#endif // __STDC_FORMAT_MACROS ] - -// 7.8.2 Functions for greatest-width integer types - -// 7.8.2.1 The imaxabs function -#define imaxabs _abs64 - -// 7.8.2.2 The imaxdiv function - -// This is modified version of div() function from Microsoft's div.c found -// in %MSVC.NET%\crt\src\div.c -#ifdef STATIC_IMAXDIV // [ -static -#else // STATIC_IMAXDIV ][ -_inline -#endif // STATIC_IMAXDIV ] -imaxdiv_t __cdecl imaxdiv(intmax_t numer, intmax_t denom) -{ - imaxdiv_t result; - - result.quot = numer / denom; - result.rem = numer % denom; - - if (numer < 0 && result.rem > 0) { - // did division wrong; must fix up - ++result.quot; - result.rem -= denom; - } - - return result; -} - -// 7.8.2.3 The strtoimax and strtoumax functions -#define strtoimax _strtoi64 -#define strtoumax _strtoui64 - -// 7.8.2.4 The wcstoimax and wcstoumax functions -#define wcstoimax _wcstoi64 -#define wcstoumax _wcstoui64 - - -#endif // _MSC_INTTYPES_H_ ] diff --git a/lib/model/rapidjson/msinttypes/stdint.h b/lib/model/rapidjson/msinttypes/stdint.h deleted file mode 100644 index bbad95af1..000000000 --- a/lib/model/rapidjson/msinttypes/stdint.h +++ /dev/null @@ -1,296 +0,0 @@ -// ISO C9x compliant stdint.h for Microsoft Visual Studio -// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 -// -// Copyright (c) 2006-2013 Alexander Chemeris -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are met: -// -// 1. Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimer. -// -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// 3. Neither the name of the product nor the names of its contributors may -// be used to endorse or promote products derived from this software -// without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -// WHETHER IN CONTRACT, STRICT LIABILITY, 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. -// -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _MSC_VER // [ -#error "Use this header only with Microsoft Visual C++ compilers!" -#endif // _MSC_VER ] - -#ifndef _MSC_STDINT_H_ // [ -#define _MSC_STDINT_H_ - -#if _MSC_VER > 1000 -#pragma once -#endif - -// miloyip: Originally Visual Studio 2010 uses its own stdint.h. However it generates warning with INT64_C(), so change to use this file for vs2010. -#if _MSC_VER >= 1600 // [ -#include - -#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) // [ See footnote 224 at page 260 - -#undef INT8_C -#undef INT16_C -#undef INT32_C -#undef INT64_C -#undef UINT8_C -#undef UINT16_C -#undef UINT32_C -#undef UINT64_C - -// 7.18.4.1 Macros for minimum-width integer constants - -#define INT8_C(val) val##i8 -#define INT16_C(val) val##i16 -#define INT32_C(val) val##i32 -#define INT64_C(val) val##i64 - -#define UINT8_C(val) val##ui8 -#define UINT16_C(val) val##ui16 -#define UINT32_C(val) val##ui32 -#define UINT64_C(val) val##ui64 - -// 7.18.4.2 Macros for greatest-width integer constants -// These #ifndef's are needed to prevent collisions with . -// Check out Issue 9 for the details. -#ifndef INTMAX_C // [ -# define INTMAX_C INT64_C -#endif // INTMAX_C ] -#ifndef UINTMAX_C // [ -# define UINTMAX_C UINT64_C -#endif // UINTMAX_C ] - -#endif // __STDC_CONSTANT_MACROS ] - -#else // ] _MSC_VER >= 1700 [ - -#include - -// For Visual Studio 6 in C++ mode and for many Visual Studio versions when -// compiling for ARM we should wrap include with 'extern "C++" {}' -// or compiler give many errors like this: -// error C2733: second C linkage of overloaded function 'wmemchr' not allowed -#ifdef __cplusplus -extern "C" { -#endif -# include -#ifdef __cplusplus -} -#endif - -// Define _W64 macros to mark types changing their size, like intptr_t. -#ifndef _W64 -# if !defined(__midl) && (defined(_X86_) || defined(_M_IX86)) && _MSC_VER >= 1300 -# define _W64 __w64 -# else -# define _W64 -# endif -#endif - - -// 7.18.1 Integer types - -// 7.18.1.1 Exact-width integer types - -// Visual Studio 6 and Embedded Visual C++ 4 doesn't -// realize that, e.g. char has the same size as __int8 -// so we give up on __intX for them. -#if (_MSC_VER < 1300) - typedef signed char int8_t; - typedef signed short int16_t; - typedef signed int int32_t; - typedef unsigned char uint8_t; - typedef unsigned short uint16_t; - typedef unsigned int uint32_t; -#else - typedef signed __int8 int8_t; - typedef signed __int16 int16_t; - typedef signed __int32 int32_t; - typedef unsigned __int8 uint8_t; - typedef unsigned __int16 uint16_t; - typedef unsigned __int32 uint32_t; -#endif -typedef signed __int64 int64_t; -typedef unsigned __int64 uint64_t; - - -// 7.18.1.2 Minimum-width integer types -typedef int8_t int_least8_t; -typedef int16_t int_least16_t; -typedef int32_t int_least32_t; -typedef int64_t int_least64_t; -typedef uint8_t uint_least8_t; -typedef uint16_t uint_least16_t; -typedef uint32_t uint_least32_t; -typedef uint64_t uint_least64_t; - -// 7.18.1.3 Fastest minimum-width integer types -typedef int8_t int_fast8_t; -typedef int16_t int_fast16_t; -typedef int32_t int_fast32_t; -typedef int64_t int_fast64_t; -typedef uint8_t uint_fast8_t; -typedef uint16_t uint_fast16_t; -typedef uint32_t uint_fast32_t; -typedef uint64_t uint_fast64_t; - -// 7.18.1.4 Integer types capable of holding object pointers -#ifdef _WIN64 // [ - typedef signed __int64 intptr_t; - typedef unsigned __int64 uintptr_t; -#else // _WIN64 ][ - typedef _W64 signed int intptr_t; - typedef _W64 unsigned int uintptr_t; -#endif // _WIN64 ] - -// 7.18.1.5 Greatest-width integer types -typedef int64_t intmax_t; -typedef uint64_t uintmax_t; - - -// 7.18.2 Limits of specified-width integer types - -#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) // [ See footnote 220 at page 257 and footnote 221 at page 259 - -// 7.18.2.1 Limits of exact-width integer types -#define INT8_MIN ((int8_t)_I8_MIN) -#define INT8_MAX _I8_MAX -#define INT16_MIN ((int16_t)_I16_MIN) -#define INT16_MAX _I16_MAX -#define INT32_MIN ((int32_t)_I32_MIN) -#define INT32_MAX _I32_MAX -#define INT64_MIN ((int64_t)_I64_MIN) -#define INT64_MAX _I64_MAX -#define UINT8_MAX _UI8_MAX -#define UINT16_MAX _UI16_MAX -#define UINT32_MAX _UI32_MAX -#define UINT64_MAX _UI64_MAX - -// 7.18.2.2 Limits of minimum-width integer types -#define INT_LEAST8_MIN INT8_MIN -#define INT_LEAST8_MAX INT8_MAX -#define INT_LEAST16_MIN INT16_MIN -#define INT_LEAST16_MAX INT16_MAX -#define INT_LEAST32_MIN INT32_MIN -#define INT_LEAST32_MAX INT32_MAX -#define INT_LEAST64_MIN INT64_MIN -#define INT_LEAST64_MAX INT64_MAX -#define UINT_LEAST8_MAX UINT8_MAX -#define UINT_LEAST16_MAX UINT16_MAX -#define UINT_LEAST32_MAX UINT32_MAX -#define UINT_LEAST64_MAX UINT64_MAX - -// 7.18.2.3 Limits of fastest minimum-width integer types -#define INT_FAST8_MIN INT8_MIN -#define INT_FAST8_MAX INT8_MAX -#define INT_FAST16_MIN INT16_MIN -#define INT_FAST16_MAX INT16_MAX -#define INT_FAST32_MIN INT32_MIN -#define INT_FAST32_MAX INT32_MAX -#define INT_FAST64_MIN INT64_MIN -#define INT_FAST64_MAX INT64_MAX -#define UINT_FAST8_MAX UINT8_MAX -#define UINT_FAST16_MAX UINT16_MAX -#define UINT_FAST32_MAX UINT32_MAX -#define UINT_FAST64_MAX UINT64_MAX - -// 7.18.2.4 Limits of integer types capable of holding object pointers -#ifdef _WIN64 // [ -# define INTPTR_MIN INT64_MIN -# define INTPTR_MAX INT64_MAX -# define UINTPTR_MAX UINT64_MAX -#else // _WIN64 ][ -# define INTPTR_MIN INT32_MIN -# define INTPTR_MAX INT32_MAX -# define UINTPTR_MAX UINT32_MAX -#endif // _WIN64 ] - -// 7.18.2.5 Limits of greatest-width integer types -#define INTMAX_MIN INT64_MIN -#define INTMAX_MAX INT64_MAX -#define UINTMAX_MAX UINT64_MAX - -// 7.18.3 Limits of other integer types - -#ifdef _WIN64 // [ -# define PTRDIFF_MIN _I64_MIN -# define PTRDIFF_MAX _I64_MAX -#else // _WIN64 ][ -# define PTRDIFF_MIN _I32_MIN -# define PTRDIFF_MAX _I32_MAX -#endif // _WIN64 ] - -#define SIG_ATOMIC_MIN INT_MIN -#define SIG_ATOMIC_MAX INT_MAX - -#ifndef SIZE_MAX // [ -# ifdef _WIN64 // [ -# define SIZE_MAX _UI64_MAX -# else // _WIN64 ][ -# define SIZE_MAX _UI32_MAX -# endif // _WIN64 ] -#endif // SIZE_MAX ] - -// WCHAR_MIN and WCHAR_MAX are also defined in -#ifndef WCHAR_MIN // [ -# define WCHAR_MIN 0 -#endif // WCHAR_MIN ] -#ifndef WCHAR_MAX // [ -# define WCHAR_MAX _UI16_MAX -#endif // WCHAR_MAX ] - -#define WINT_MIN 0 -#define WINT_MAX _UI16_MAX - -#endif // __STDC_LIMIT_MACROS ] - - -// 7.18.4 Limits of other integer types - -#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) // [ See footnote 224 at page 260 - -// 7.18.4.1 Macros for minimum-width integer constants - -#define INT8_C(val) val##i8 -#define INT16_C(val) val##i16 -#define INT32_C(val) val##i32 -#define INT64_C(val) val##i64 - -#define UINT8_C(val) val##ui8 -#define UINT16_C(val) val##ui16 -#define UINT32_C(val) val##ui32 -#define UINT64_C(val) val##ui64 - -// 7.18.4.2 Macros for greatest-width integer constants -// These #ifndef's are needed to prevent collisions with . -// Check out Issue 9 for the details. -#ifndef INTMAX_C // [ -# define INTMAX_C INT64_C -#endif // INTMAX_C ] -#ifndef UINTMAX_C // [ -# define UINTMAX_C UINT64_C -#endif // UINTMAX_C ] - -#endif // __STDC_CONSTANT_MACROS ] - -#endif // _MSC_VER >= 1600 ] - -#endif // _MSC_STDINT_H_ ] diff --git a/lib/model/rapidjson/rapidjson.h b/lib/model/rapidjson/rapidjson.h index 3f743234d..333d7c6ae 100644 --- a/lib/model/rapidjson/rapidjson.h +++ b/lib/model/rapidjson/rapidjson.h @@ -63,14 +63,9 @@ */ #ifndef RAPIDJSON_NO_INT64DEFINE //!@cond RAPIDJSON_HIDDEN_FROM_DOXYGEN -#ifdef _MSC_VER -#include "msinttypes/stdint.h" -#include "msinttypes/inttypes.h" -#else // Other compilers should have this. #include #include -#endif //!@endcond #ifdef RAPIDJSON_DOXYGEN_RUNNING #define RAPIDJSON_NO_INT64DEFINE diff --git a/lib/value_scalar.cpp b/lib/value_scalar.cpp index 8c3dcf386..7cd4d4004 100644 --- a/lib/value_scalar.cpp +++ b/lib/value_scalar.cpp @@ -1,3 +1,5 @@ +#define NOMINMAX + #include #include #include "isaac/array.h" diff --git a/lib/wrap/clBLAS.cpp b/lib/wrap/clBLAS.cpp index 87ea2599b..e47c31395 100644 --- a/lib/wrap/clBLAS.cpp +++ b/lib/wrap/clBLAS.cpp @@ -30,7 +30,8 @@ extern "C" for(cl_uint i = 0 ; i < numCommandQueues ; ++i) { std::list levents; - is::driver::CommandQueue queue(cl::CommandQueue(commandQueues[i])); + cl::CommandQueue queuepp(commandQueues[i]); + is::driver::CommandQueue queue(queuepp); clRetainCommandQueue(commandQueues[i]); is::execution_options_type options(queue, &levents, &waitlist); is::execute(is::control(operation, options), is::models(options.queue(context))); diff --git a/python/setup.py b/python/setup.py old mode 100644 new mode 100755 index 1292e8edb..215acf2c4 --- a/python/setup.py +++ b/python/setup.py @@ -1,170 +1,170 @@ -#Thanks to Andreas Knoeckler for providing stand-alone boost.python -#through PyOpenCL and PyCUDA - -import os, sys -from distutils.ccompiler import show_compilers,new_compiler -from distutils.command.build_ext import build_ext -from distutils.command.build_py import build_py -from distutils.core import setup, Extension -from distutils.sysconfig import get_python_inc -from distutils import sysconfig -from imp import find_module -from glob import glob -from os.path import dirname - -platform_cflags = {} -platform_ldflags = {} -platform_libs = {} - -class build_ext_subclass(build_ext): - def build_extensions(self): - c = self.compiler.compiler_type - if c in platform_cflags.keys(): - for e in self.extensions: - e.extra_compile_args = platform_cflags[c] - if c in platform_ldflags.keys(): - for e in self.extensions: - e.extra_link_args = platform_ldflags[c] - if c in platform_libs.keys(): - for e in self.extensions: - try: - e.libraries += platform_libs[c] - except: - e.libraries = platform_libs[c] - build_ext.build_extensions(self) - -def main(): - - def recursive_glob(rootdir='.', suffix=''): - return [os.path.join(looproot, filename) - for looproot, _, filenames in os.walk(rootdir) - for filename in filenames if filename.endswith(suffix)] - - def remove_prefixes(optlist, bad_prefixes): - for bad_prefix in bad_prefixes: - for i, flag in enumerate(optlist): - if flag.startswith(bad_prefix): - optlist.pop(i) - break - return optlist - - def find_library(name, cmake_glob_list): - cvars = sysconfig.get_config_vars() - compiler = new_compiler() - dirs = [] - for gpath in cmake_glob_list.split(';'): - path = glob(gpath) - if path: - dirs += [path[0]] - return compiler.find_library_file(cvars['LIBDIR'].split(';') + dirs, name) - - def find_opencl(): - cvars = sysconfig.get_config_vars() - is_on_android = '-mandroid' in cvars['PY_CFLAGS'] - lib = find_library('OpenCL', '/opt/adreno-driver*/lib' if is_on_android else '/opt/AMDAPPSDK*/lib/x86_64') - return {'include': '', 'lib': dirname(lib)} if lib else None - - def find_in_path(name, path): - "Find a file in a search path" - #adapted fom http://code.activestate.com/recipes/52224-find-a-file-given-a-search-path/ - for dir in path.split(os.pathsep): - binpath = os.path.join(dir, name) - if os.path.exists(binpath): - return os.path.abspath(binpath) - return None - - def find_cuda(): - if 'CUDAHOME' in os.environ: - home = os.environ['CUDAHOME'] - nvcc = os.path.join(home, 'bin', 'nvcc') - else: - nvcc = find_in_path('nvcc', os.environ['PATH']) - - if nvcc: - home = dirname(os.path.dirname(nvcc)) - return {'include': os.path.join(home, 'include'), - 'lib': os.path.join(home, 'lib64')} - else: - return None - - - #Tweaks warning, because boost-numpy and boost-python won't compile cleanly without these changes - cvars = sysconfig.get_config_vars() - cvars['OPT'] = str.join(' ', remove_prefixes(cvars['OPT'].split(), ['-g', '-Wstrict-prototypes'])) - cvars["CFLAGS"] = cvars["BASECFLAGS"] + ' ' + cvars['OPT'] - cvars["LDFLAGS"] = '-Wl,--no-as-needed ' + cvars["LDFLAGS"] - - #OpenCL - opencl_config = find_opencl() - - #CUDA - cuda_config = find_cuda() - - #Libraries - libraries = ['OpenCL'] - if cuda_config: libraries += ['cuda', 'nvrtc'] - - #Backends: - backend_defines = ['-DISAAC_WITH_OPENCL'] - if cuda_config: backend_defines += ['-DISAAC_WITH_CUDA'] - - #Library directories - library_dirs = [config['lib'] for config in [opencl_config, cuda_config] if config is not None] - - #Include directories - include =' src/include'.split() + ['external/boost/include', os.path.join(find_module("numpy")[1], "core", "include")] - - #Source files - src = 'src/lib/array.cpp src/lib/value_scalar.cpp src/lib/wrap/clBLAS.cpp src/lib/symbolic/preset.cpp src/lib/symbolic/execute.cpp src/lib/symbolic/io.cpp src/lib/symbolic/expression.cpp src/lib/model/model.cpp src/lib/model/predictors/random_forest.cpp src/lib/exception/unknown_datatype.cpp src/lib/exception/operation_not_supported.cpp src/lib/driver/program.cpp src/lib/driver/platform.cpp src/lib/driver/ndrange.cpp src/lib/driver/kernel.cpp src/lib/driver/handle.cpp src/lib/driver/event.cpp src/lib/driver/device.cpp src/lib/driver/context.cpp src/lib/driver/command_queue.cpp src/lib/driver/check.cpp src/lib/driver/buffer.cpp src/lib/driver/backend.cpp src/lib/backend/parse.cpp src/lib/backend/mapped_object.cpp src/lib/backend/templates/gemm.cpp src/lib/backend/templates/ger.cpp src/lib/backend/templates/gemv.cpp src/lib/backend/templates/dot.cpp src/lib/backend/templates/base.cpp src/lib/backend/templates/axpy.cpp src/lib/backend/stream.cpp src/lib/backend/keywords.cpp src/lib/backend/binder.cpp '.split() + [os.path.join('src', 'wrap', sf) for sf in ['_isaac.cpp', 'core.cpp', 'driver.cpp', 'model.cpp', 'exceptions.cpp']] - boostsrc = 'external/boost/libs/' - for s in ['numpy','python','smart_ptr','system','thread']: - src = src + [x for x in recursive_glob('external/boost/libs/' + s + '/src/','.cpp') if 'win32' not in x and 'pthread' not in x] - # make sure next line succeeds even on Windows - src = [f.replace("\\", "/") for f in src] - if sys.platform == "win32": - src += glob(boostsrc + "/thread/src/win32/*.cpp") - src += glob(boostsrc + "/thread/src/tss_null.cpp") - else: - src += glob(boostsrc + "/thread/src/pthread/*.cpp") - src= [f for f in src if not f.endswith("once_atomic.cpp")] - - #Setup - setup( - name='isaac', - version='1.0', - description="Input-specific architecture-aware computations", - author='Philippe Tillet', - author_email='ptillet@g.harvard.edu', - license='MPL 2.0', - packages=["isaac"], - ext_package="isaac", - ext_modules=[Extension( - '_isaac',src, - extra_compile_args= backend_defines + ['-std=c++11', '-Wno-unused-function', '-Wno-unused-local-typedefs', '-Wno-sign-compare'], - extra_link_args=['-Wl,-soname=_isaac.so'], - undef_macros=[], - include_dirs=include, - library_dirs=library_dirs, - libraries=libraries - )], - cmdclass={'build_py': build_py, 'build_ext': build_ext_subclass}, - classifiers=[ - 'Environment :: Console', - 'Development Status :: 1 - Experimental', - 'Intended Audience :: Developers', - 'Intended Audience :: Other Audience', - 'Intended Audience :: Science/Research', - 'License :: OSI Approved :: MIT License', - 'Natural Language :: English', - 'Programming Language :: C++', - 'Programming Language :: Python', - 'Programming Language :: Python :: 3', - 'Topic :: Scientific/Engineering', - 'Topic :: Scientific/Engineering :: Mathematics', - 'Topic :: Scientific/Engineering :: Physics', - 'Topic :: Scientific/Engineering :: Machine Learning', - ] - ) - -if __name__ == "__main__": - main() +#Thanks to Andreas Knoeckler for providing stand-alone boost.python +#through PyOpenCL and PyCUDA + +import os, sys +from distutils.ccompiler import show_compilers,new_compiler +from distutils.command.build_ext import build_ext +from distutils.command.build_py import build_py +from distutils.core import setup, Extension +from distutils.sysconfig import get_python_inc +from distutils import sysconfig +from imp import find_module +from glob import glob +from os.path import dirname + +platform_cflags = {} +platform_ldflags = {} +platform_libs = {} + +class build_ext_subclass(build_ext): + def build_extensions(self): + c = self.compiler.compiler_type + if c in platform_cflags.keys(): + for e in self.extensions: + e.extra_compile_args = platform_cflags[c] + if c in platform_ldflags.keys(): + for e in self.extensions: + e.extra_link_args = platform_ldflags[c] + if c in platform_libs.keys(): + for e in self.extensions: + try: + e.libraries += platform_libs[c] + except: + e.libraries = platform_libs[c] + build_ext.build_extensions(self) + +def main(): + + def recursive_glob(rootdir='.', suffix=''): + return [os.path.join(looproot, filename) + for looproot, _, filenames in os.walk(rootdir) + for filename in filenames if filename.endswith(suffix)] + + def remove_prefixes(optlist, bad_prefixes): + for bad_prefix in bad_prefixes: + for i, flag in enumerate(optlist): + if flag.startswith(bad_prefix): + optlist.pop(i) + break + return optlist + + def find_library(name, cmake_glob_list): + cvars = sysconfig.get_config_vars() + compiler = new_compiler() + dirs = [] + for gpath in cmake_glob_list.split(';'): + path = glob(gpath) + if path: + dirs += [path[0]] + return compiler.find_library_file(cvars['LIBDIR'].split(';') + dirs, name) + + def find_opencl(): + cvars = sysconfig.get_config_vars() + is_on_android = '-mandroid' in cvars['PY_CFLAGS'] + lib = find_library('OpenCL', '/opt/adreno-driver*/lib' if is_on_android else '/opt/AMDAPPSDK*/lib/x86_64') + return {'include': '', 'lib': dirname(lib)} if lib else None + + def find_in_path(name, path): + "Find a file in a search path" + #adapted fom http://code.activestate.com/recipes/52224-find-a-file-given-a-search-path/ + for dir in path.split(os.pathsep): + binpath = os.path.join(dir, name) + if os.path.exists(binpath): + return os.path.abspath(binpath) + return None + + def find_cuda(): + if 'CUDAHOME' in os.environ: + home = os.environ['CUDAHOME'] + nvcc = os.path.join(home, 'bin', 'nvcc') + else: + nvcc = find_in_path('nvcc', os.environ['PATH']) + + if nvcc: + home = dirname(os.path.dirname(nvcc)) + return {'include': os.path.join(home, 'include'), + 'lib': os.path.join(home, 'lib64')} + else: + return None + + + #Tweaks warning, because boost-numpy and boost-python won't compile cleanly without these changes + cvars = sysconfig.get_config_vars() + cvars['OPT'] = str.join(' ', remove_prefixes(cvars['OPT'].split(), ['-g', '-Wstrict-prototypes'])) + cvars["CFLAGS"] = cvars["BASECFLAGS"] + ' ' + cvars['OPT'] + cvars["LDFLAGS"] = '-Wl,--no-as-needed ' + cvars["LDFLAGS"] + + #OpenCL + opencl_config = find_opencl() + + #CUDA + cuda_config = find_cuda() + + #Libraries + libraries = ['OpenCL'] + if cuda_config: libraries += ['cuda', 'nvrtc'] + + #Backends: + backend_defines = ['-DISAAC_WITH_OPENCL'] + if cuda_config: backend_defines += ['-DISAAC_WITH_CUDA'] + + #Library directories + library_dirs = [config['lib'] for config in [opencl_config, cuda_config] if config is not None] + + #Include directories + include =' src/include'.split() + ['external/boost/include', os.path.join(find_module("numpy")[1], "core", "include")] + + #Source files + src = 'src/lib/wrap/clBLAS.cpp src/lib/value_scalar.cpp src/lib/symbolic/preset.cpp src/lib/symbolic/io.cpp src/lib/symbolic/expression.cpp src/lib/symbolic/execute.cpp src/lib/model/predictors/random_forest.cpp src/lib/model/model.cpp src/lib/exception/unknown_datatype.cpp src/lib/exception/operation_not_supported.cpp src/lib/driver/program.cpp src/lib/driver/platform.cpp src/lib/driver/ndrange.cpp src/lib/driver/kernel.cpp src/lib/driver/handle.cpp src/lib/driver/event.cpp src/lib/driver/device.cpp src/lib/driver/context.cpp src/lib/driver/command_queue.cpp src/lib/driver/check.cpp src/lib/driver/buffer.cpp src/lib/driver/backend.cpp src/lib/backend/templates/ger.cpp src/lib/backend/templates/gemv.cpp src/lib/backend/templates/gemm.cpp src/lib/backend/templates/dot.cpp src/lib/backend/templates/base.cpp src/lib/backend/templates/axpy.cpp src/lib/backend/stream.cpp src/lib/backend/parse.cpp src/lib/backend/mapped_object.cpp src/lib/backend/keywords.cpp src/lib/backend/binder.cpp src/lib/array.cpp '.split() + [os.path.join('src', 'wrap', sf) for sf in ['_isaac.cpp', 'core.cpp', 'driver.cpp', 'model.cpp', 'exceptions.cpp']] + boostsrc = 'external/boost/libs/' + for s in ['numpy','python','smart_ptr','system','thread']: + src = src + [x for x in recursive_glob('external/boost/libs/' + s + '/src/','.cpp') if 'win32' not in x and 'pthread' not in x] + # make sure next line succeeds even on Windows + src = [f.replace("\\", "/") for f in src] + if sys.platform == "win32": + src += glob(boostsrc + "/thread/src/win32/*.cpp") + src += glob(boostsrc + "/thread/src/tss_null.cpp") + else: + src += glob(boostsrc + "/thread/src/pthread/*.cpp") + src= [f for f in src if not f.endswith("once_atomic.cpp")] + + #Setup + setup( + name='isaac', + version='1.0', + description="Input-specific architecture-aware computations", + author='Philippe Tillet', + author_email='ptillet@g.harvard.edu', + license='MPL 2.0', + packages=["isaac"], + ext_package="isaac", + ext_modules=[Extension( + '_isaac',src, + extra_compile_args= backend_defines + ['-std=c++11', '-Wno-unused-function', '-Wno-unused-local-typedefs', '-Wno-sign-compare'], + extra_link_args=['-Wl,-soname=_isaac.so'], + undef_macros=[], + include_dirs=include, + library_dirs=library_dirs, + libraries=libraries + )], + cmdclass={'build_py': build_py, 'build_ext': build_ext_subclass}, + classifiers=[ + 'Environment :: Console', + 'Development Status :: 1 - Experimental', + 'Intended Audience :: Developers', + 'Intended Audience :: Other Audience', + 'Intended Audience :: Science/Research', + 'License :: OSI Approved :: MIT License', + 'Natural Language :: English', + 'Programming Language :: C++', + 'Programming Language :: Python', + 'Programming Language :: Python :: 3', + 'Topic :: Scientific/Engineering', + 'Topic :: Scientific/Engineering :: Mathematics', + 'Topic :: Scientific/Engineering :: Physics', + 'Topic :: Scientific/Engineering :: Machine Learning', + ] + ) + +if __name__ == "__main__": + main()