From f35f3fe77a6d116f06b090fa9d83108e913b505f Mon Sep 17 00:00:00 2001 From: Qiao Longfei Date: Tue, 27 Nov 2018 14:40:15 +0800 Subject: [PATCH] ctr reader can not be used in windows test=develop --- CMakeLists.txt | 2 +- paddle/fluid/operators/reader/CMakeLists.txt | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c0287a9a6..efa68c9ba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -204,7 +204,6 @@ include(external/eigen) # download eigen3 include(external/pybind11) # download pybind11 include(external/cares) include(external/cub) -include(external/gzstream) include(external/rocprim) include(external/xxhash) # download xxhash include(external/dlpack) @@ -215,6 +214,7 @@ if (NOT WIN32) # there is no official support of warpctc, nccl, cupti in windows include(external/warpctc) # download, build, install warpctc include(cupti) +include(external/gzstream) endif (NOT WIN32) if(WITH_DISTRIBUTE) diff --git a/paddle/fluid/operators/reader/CMakeLists.txt b/paddle/fluid/operators/reader/CMakeLists.txt index a82f2b13c..f52a64bb1 100644 --- a/paddle/fluid/operators/reader/CMakeLists.txt +++ b/paddle/fluid/operators/reader/CMakeLists.txt @@ -18,10 +18,7 @@ function(reader_library TARGET_NAME) endfunction() cc_library(buffered_reader SRCS buffered_reader.cc DEPS reader simple_threadpool) -cc_library(ctr_reader SRCS ctr_reader.cc DEPS gzstream reader zlib) -cc_test(ctr_reader_test SRCS ctr_reader_test.cc DEPS ctr_reader) reader_library(open_files_op SRCS open_files_op.cc DEPS buffered_reader) -reader_library(create_ctr_reader_op SRCS create_ctr_reader_op.cc DEPS ctr_reader) reader_library(create_random_data_generator_op SRCS create_random_data_generator_op.cc) reader_library(create_shuffle_reader_op SRCS create_shuffle_reader_op.cc) reader_library(create_batch_reader_op SRCS create_batch_reader_op.cc) @@ -31,6 +28,12 @@ reader_library(create_multi_pass_reader_op SRCS create_multi_pass_reader_op.cc) reader_library(create_custom_reader_op SRCS create_custom_reader_op.cc) reader_library(create_py_reader_op SRCS create_py_reader_op.cc) +if (NOT WIN32) + cc_library(ctr_reader SRCS ctr_reader.cc DEPS gzstream reader zlib) + cc_test(ctr_reader_test SRCS ctr_reader_test.cc DEPS ctr_reader) + reader_library(create_ctr_reader_op SRCS create_ctr_reader_op.cc DEPS ctr_reader) +endif (NOT WIN32) + cc_test(reader_blocking_queue_test SRCS reader_blocking_queue_test.cc) # Export local libraries to parent # set(READER_LIBRARY ${LOCAL_READER_LIBS} PARENT_SCOPE) -- GitLab