Browse Source

fix: link error

tags/v1.5.0-rc1
jonyguo 4 years ago
parent
commit
f023b78b00
2 changed files with 14 additions and 2 deletions
  1. +10
    -2
      mindspore/ccsrc/minddata/dataset/engine/cache/CMakeLists.txt
  2. +4
    -0
      mindspore/dataset/engine/cache_admin.py

+ 10
- 2
mindspore/ccsrc/minddata/dataset/engine/cache/CMakeLists.txt View File

@@ -82,6 +82,7 @@ if(ENABLE_CACHE)
${PYTHON_LIBRARIES}
${SECUREC_LIBRARY}
pthread
-ldl
-Wl,--no-as-needed
mindspore::grpc++)
else()
@@ -95,6 +96,7 @@ if(ENABLE_CACHE)
${PYTHON_LIBRARIES}
${SECUREC_LIBRARY}
pthread
-ldl
-Wl,--no-as-needed
mindspore::grpc++
-Wl,--as-needed)
@@ -109,8 +111,14 @@ if(ENABLE_CACHE)
endif()

add_executable(cache_admin cache_admin.cc cache_admin_arg.cc)
target_link_libraries(cache_admin _c_dataengine _c_mindrecord mindspore::protobuf ${PYTHON_LIBRARIES} pthread)
target_link_libraries(cache_admin mindspore -Wl,--as-needed mindspore_core mindspore_shared_lib)
target_link_libraries(cache_admin _c_dataengine _c_mindrecord ${PYTHON_LIBRARIES} pthread -ldl)
if(ENABLE_TDTQUE)
target_link_libraries(cache_admin
-Wl,--start-group mindspore::protobuf mindspore_core mindspore_shared_lib ${ACL_TDT_CHANNEL} -Wl,--end-group)
else()
target_link_libraries(cache_admin
-Wl,--start-group mindspore::protobuf mindspore_core mindspore_shared_lib -Wl,--end-group)
endif()

if(USE_GLOG)
target_link_libraries(cache_admin mindspore::glog)


+ 4
- 0
mindspore/dataset/engine/cache_admin.py View File

@@ -28,6 +28,10 @@ def main():
cache_admin_dir = os.path.join(os.path.dirname(mindspore.__file__), "bin")
os.chdir(cache_admin_dir)
cache_admin = os.path.join(cache_admin_dir, "cache_admin")

if not os.path.exists(cache_admin):
raise RuntimeError("Dataset cache is not supported on your mindspore version.")

cache_server = os.path.join(cache_admin_dir, "cache_server")
os.chmod(cache_admin, stat.S_IRWXU)
os.chmod(cache_server, stat.S_IRWXU)


Loading…
Cancel
Save