Skip to content

Fix pinnedMemManager check. Fix MKL Sequential layer #2840

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
umar456 merged 2 commits into from
Apr 14, 2020
Merged

Fix pinnedMemManager check. Fix MKL Sequential layer #2840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
936ab1e
Remove MKL_ThreadingLibrary from required var. Sequential doesn have one
umar456 Apr 14, 2020
4b3729e
Fix pinned memory manager check, was testing the function pointer
umar456 Apr 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions CMakeModules/FindMKL.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,17 +357,15 @@ find_package_handle_standard_args(MKL_Shared
REQUIRED_VARS MKL_INCLUDE_DIR
MKL_Core_LINK_LIBRARY
MKL_Interface_LINK_LIBRARY
MKL_ThreadLayer_LINK_LIBRARY
MKL_ThreadingLibrary_LINK_LIBRARY)
MKL_ThreadLayer_LINK_LIBRARY)
Comment thread
9prady9 marked this conversation as resolved.

find_package_handle_standard_args(MKL_Static
FAIL_MESSAGE "Could NOT find MKL: Source the compilervars.sh or mklvars.sh scripts included with your installation of MKL. This script searches for the libraries in MKLROOT, LIBRARY_PATHS(Linux), and LIB(Windows) environment variables"
VERSION_VAR MKL_VERSION_STRING
REQUIRED_VARS MKL_INCLUDE_DIR
MKL_Core_STATIC_LINK_LIBRARY
MKL_Interface_STATIC_LINK_LIBRARY
MKL_ThreadLayer_STATIC_LINK_LIBRARY
MKL_ThreadingLibrary_LINK_LIBRARY)
MKL_ThreadLayer_STATIC_LINK_LIBRARY)

if(NOT WIN32)
find_library(M_LIB m)
Expand Down
2 changes: 1 addition & 1 deletion src/backend/cuda/device_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ void DeviceManager::setMemoryManagerPinned(
// pinnedMemoryManager()
pinnedMemoryManager();
// Calls shutdown() on the existing memory manager.
if (pinnedMemoryManager) { pinnedMemManager->shutdownAllocator(); }
if (pinnedMemManager) { pinnedMemManager->shutdownAllocator(); }
// Set the backend memory manager for this new manager to register native
// functions correctly.
pinnedMemManager = std::move(newMgr);
Expand Down
4 changes: 2 additions & 2 deletions src/backend/opencl/device_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,10 +362,10 @@ void DeviceManager::setMemoryManagerPinned(
// pinnedMemoryManager()
pinnedMemoryManager();
// Calls shutdown() on the existing memory manager.
pinnedMemManager->shutdownAllocator();
pinnedMemManager = std::move(newMgr);
if (pinnedMemManager) { pinnedMemManager->shutdownAllocator(); }
// Set the backend pinned memory manager for this new manager to register
// native functions correctly.
pinnedMemManager = std::move(newMgr);
std::unique_ptr<opencl::AllocatorPinned> deviceMemoryManager(
new opencl::AllocatorPinned());
pinnedMemManager->setAllocator(std::move(deviceMemoryManager));
Expand Down