Skip to content

Commit 63f2a0d

Browse files
committed
fix: linker errors on macOS when building with cmake
* To build using cmake OpenMP must be disabled : cmake ../ -DARM_COMPUTE_ENABLE_ASSERTS=ON -DARM_COMPUTE_BUILD_EXAMPLES=ON -DARM_COMPUTE_BUILD_TESTING=ON -DARM_COMPUTE_ENABLE_OPENMP=OFF * Requires minimum clang version 17.0.0. This was tested with clang-1700.0.13.5 * Resolves MLCE-1562 Change-Id: Idbd190845f8ddfecf74ff4907f0a556a6ae64e43 Signed-off-by: Pablo Marquez Tello <pablo.tello@arm.com> Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/15068 Tested-by: Arm Jenkins <bsgcomp@arm.com> Reviewed-by: Gunes Bayir <gunes.bayir@arm.com> Comments-Addressed: Arm Jenkins <bsgcomp@arm.com> Benchmark: Arm Jenkins <bsgcomp@arm.com>
1 parent b92dff2 commit 63f2a0d

2 files changed

Lines changed: 8 additions & 6 deletions

File tree

CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -156,12 +156,12 @@ set_target_properties(
156156

157157
add_library(arm_compute_graph ${ARM_COMPUTE_LIB_BUILD_TYPE})
158158
set_target_properties(
159-
arm_compute_graph
160-
PROPERTIES
161-
COMPILE_OPTIONS "${ARM_COMPUTE_ARCH};${ARM_COMPUTE_COMMON_CCXX_FLAGS}"
162-
COMPILE_DEFINITIONS "${ARM_COMPUTE_DEFINES}"
163-
INCLUDE_DIRECTORIES "${ARM_COMPUTE_GRAPH_INCLUDE}"
164-
LINK_LIBRARIES "${ARM_COMPUTE_LINK_LIBS}"
159+
arm_compute_graph
160+
PROPERTIES
161+
COMPILE_OPTIONS "${ARM_COMPUTE_ARCH};${ARM_COMPUTE_COMMON_CCXX_FLAGS}"
162+
COMPILE_DEFINITIONS "${ARM_COMPUTE_DEFINES}"
163+
INCLUDE_DIRECTORIES "${ARM_COMPUTE_GRAPH_INCLUDE}"
164+
LINK_LIBRARIES "${ARM_COMPUTE_LINK_LIBS}$<IF:$<PLATFORM_ID:Darwin>,;arm_compute,>"
165165
)
166166

167167
add_library(

src/runtime/OMP/OMPScheduler.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2222
* SOFTWARE.
2323
*/
24+
#if ARM_COMPUTE_OPENMP_SCHEDULER
2425
#include "arm_compute/runtime/OMP/OMPScheduler.h"
2526

2627
#include "arm_compute/core/CPP/ICPPKernel.h"
@@ -157,3 +158,4 @@ void OMPScheduler::run_workloads(std::vector<arm_compute::IScheduler::Workload>
157158
}
158159
#endif /* DOXYGEN_SKIP_THIS */
159160
} // namespace arm_compute
161+
#endif /* ARM_COMPUTE_OPENMP_SCHEDULER */

0 commit comments

Comments
 (0)