Merge pull request #697 from veselypeta/petr/support-apple

[UR] Allow compilation on apple for OpenCL support

Author: veselypeta

.github/workflows/cmake.yml

@@ -125,3 +125,33 @@ jobs:
     - name: Test
       working-directory: ${{github.workspace}}/build
       run: ctest -C ${{matrix.build_type}} --output-on-failure -L "python|umf|loader|validation|tracing|unit|urtrace"
+
+
+  macos-build:
+    name: Build - MacOS
+    strategy:
+        matrix:
+          os: ['macos-12', 'macos-13']
+    runs-on: ${{matrix.os}}
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - uses: actions/setup-python@v4
+      with:
+        python-version: 3.9
+
+    - name: Install prerequisites
+      run: python3 -m pip install -r third_party/requirements.txt
+
+    - name: Configure CMake
+      run: >
+        cmake
+        -B${{github.workspace}}/build
+        -DUR_ENABLE_TRACING=ON
+        -DUR_DEVELOPER_MODE=ON
+        -DCMAKE_BUILD_TYPE=Release
+        -DUR_BUILD_TESTS=ON
+        -DUR_FORMAT_CPP_STYLE=ON
+    - name: Build
+      run: cmake --build ${{github.workspace}}/build -j $(nproc)

CMakeLists.txt

@@ -14,6 +14,10 @@ include(CTest)
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 include(helpers)
 
+if(CMAKE_SYSTEM_NAME STREQUAL Darwin)
+  set(CMAKE_FIND_FRAMEWORK NEVER)
+endif()
+
 find_package(Python3 COMPONENTS Interpreter)
 
 set(CMAKE_CXX_STANDARD 17)
@@ -52,7 +56,7 @@ endif()
 if(NOT MSVC)
     add_compile_options(-fPIC -Wall -Wpedantic
         $<$<CXX_COMPILER_ID:GNU>:-fdiagnostics-color=always>
-        $<$<CXX_COMPILER_ID:Clang>:-fcolor-diagnostics>)
+        $<$<CXX_COMPILER_ID:Clang,AppleClang>:-fcolor-diagnostics>)
     if(UR_DEVELOPER_MODE)
         add_compile_options(-Werror -fno-omit-frame-pointer)
     endif()

examples/hello_world/CMakeLists.txt

@@ -9,10 +9,6 @@ add_executable(${TARGET_NAME}
     ${CMAKE_CURRENT_SOURCE_DIR}/hello_world.cpp
 )
 
-target_include_directories(${TARGET_NAME} PRIVATE
-    ${CMAKE_SOURCE_DIR}/include
-)
-
 if(MSVC)
     set_target_properties(${TARGET_NAME}
         PROPERTIES
@@ -24,4 +20,5 @@ endif()
 target_link_libraries(${TARGET_NAME} PRIVATE
     ${PROJECT_NAME}::loader
     ${CMAKE_DL_LIBS}
+    ${PROJECT_NAME}::headers
 )

source/common/linux/ur_lib_loader.cpp

@@ -12,7 +12,7 @@
 #include "logger/ur_logger.hpp"
 #include "ur_lib_loader.hpp"
 
-#if defined(SANITIZER_ANY)
+#if defined(SANITIZER_ANY) || defined(__APPLE__)
 #define LOAD_DRIVER_LIBRARY(NAME) dlopen(NAME, RTLD_LAZY | RTLD_LOCAL)
 #else
 #define LOAD_DRIVER_LIBRARY(NAME)                                              \

source/common/umf_pools/disjoint_pool.hpp

@@ -11,6 +11,7 @@
 
 #include <atomic>
 #include <memory>
+#include <string>
 
 #include "../umf_helpers.hpp"
 

source/common/ur_util.hpp

@@ -57,8 +57,12 @@ inline int ur_getpid(void) { return static_cast<int>(getpid()); }
 #define MAKE_LIBRARY_NAME(NAME, VERSION) NAME ".dll"
 #else
 #define HMODULE void *
+#if defined(__APPLE__)
+#define MAKE_LIBRARY_NAME(NAME, VERSION) "lib" NAME "." VERSION ".dylib"
+#else
 #define MAKE_LIBRARY_NAME(NAME, VERSION) "lib" NAME ".so." VERSION
 #endif
+#endif
 
 inline std::string create_library_path(const char *name, const char *path) {
     std::string library_path;

test/unified_malloc_framework/common/pool.hpp

@@ -11,7 +11,11 @@
 #ifndef UMF_TEST_POOL_HPP
 #define UMF_TEST_POOL_HPP 1
 
+#if defined(__APPLE__)
+#include <malloc/malloc.h>
+#else
 #include <malloc.h>
+#endif
 #include <umf/base.h>
 #include <umf/memory_provider.h>
 
@@ -61,6 +65,8 @@ struct malloc_pool : public pool_base {
     size_t malloc_usable_size(void *ptr) noexcept {
 #ifdef _WIN32
         return _msize(ptr);
+#elif __APPLE__
+        return ::malloc_size(ptr);
 #else
         return ::malloc_usable_size(ptr);
 #endif