File tree Expand file tree Collapse file tree 4 files changed +18
-7
lines changed Expand file tree Collapse file tree 4 files changed +18
-7
lines changed Original file line number Diff line number Diff line change @@ -85,7 +85,7 @@ function(op_library TARGET)
85
85
86
86
#remove windows unsupported op
87
87
if (WIN32 )
88
- foreach (windows_unsupport_op "nccl_op" "gen_nccl_id_op" )
88
+ foreach (windows_unsupport_op "nccl_op" "gen_nccl_id_op" "warpctc_op" )
89
89
if ("${TARGET} " STREQUAL "${windows_unsupport_op} " )
90
90
return ()
91
91
endif ()
@@ -319,8 +319,9 @@ foreach(src ${GENERAL_OPS})
319
319
endforeach ()
320
320
321
321
file (APPEND ${pybind_file} "USE_OP(less_than);\n USE_OP(logical_and);\n USE_NO_KERNEL_OP(read_from_array);\n " )
322
-
322
+ if ( NOT WIN32 )
323
323
add_subdirectory (reader )
324
+ endif (NOT WIN32 )
324
325
foreach (src ${READER_LIBRARY} )
325
326
set (OP_LIBRARY ${src} ${OP_LIBRARY} )
326
327
endforeach ()
Original file line number Diff line number Diff line change @@ -19,6 +19,10 @@ limitations under the License. */
19
19
20
20
#ifdef PADDLE_USE_OPENBLAS
21
21
#include < cblas.h>
22
+ // remove typedef in openblas
23
+ #undef FLOAT
24
+ #undef INT
25
+ #undef SIZE
22
26
#endif
23
27
24
28
#include < cmath>
Original file line number Diff line number Diff line change @@ -56,7 +56,11 @@ limitations under the License. */
56
56
#include < immintrin.h>
57
57
#endif // PADDLE_ARM
58
58
59
+ #if !defined(_WIN32)
59
60
#define PADDLE_ALIGN (x ) __attribute__((aligned(x)))
61
+ #else
62
+ #define PADDLE_ALIGN (x ) /* do nothing*/
63
+ #endif
60
64
61
65
namespace paddle {
62
66
namespace platform {
Original file line number Diff line number Diff line change 1
- set (PYBIND_DEPS pybind python proto_desc memory executor prune profiler feed_fetch_method
2
- )
1
+
2
+ set (PYBIND_DEPS pybind python proto_desc memory executor prune feed_fetch_method )
3
+ set (PYBIND_SRCS pybind.cc exception.cc protobuf.cc const_value.cc )
3
4
if (NOT WIN32 )
4
- list (APPEND PYBIND_DEPS parallel_executor )
5
+ list (APPEND PYBIND_DEPS parallel_executor profiler )
6
+ list (APPEND PYBIND_SRCS recordio.cc )
5
7
endif ()
6
8
if (WITH_PYTHON )
7
9
if (WITH_AMD_GPU )
8
10
hip_library (paddle_pybind SHARED
9
- SRCS pybind.cc exception.cc protobuf.cc const_value.cc recordio.cc
11
+ SRCS ${PYBIND_SRCS}
10
12
DEPS ${PYBIND_DEPS}
11
13
${GLOB_OP_LIB} )
12
14
else ()
13
15
cc_library (paddle_pybind SHARED
14
- SRCS pybind.cc exception.cc protobuf.cc const_value.cc recordio.cc
16
+ SRCS ${PYBIND_SRCS}
15
17
DEPS ${PYBIND_DEPS}
16
18
${GLOB_OP_LIB} )
17
19
if (NOT APPLE AND NOT ANDROID AND NOT WIN32 )
You can’t perform that action at this time.
0 commit comments