Skip to content

Commit e482aed

Browse files
committed
upgrade to new accelerate veclib api
1 parent 366e79f commit e482aed

File tree

3 files changed

+17
-2
lines changed

3 files changed

+17
-2
lines changed

Diff for: CMakeLists.txt

+9-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
1-
cmake_minimum_required(VERSION 3.10)
1+
cmake_minimum_required(VERSION 3.20)
22
project(cfmm)
3+
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
4+
add_definitions(-DUSE_ACCELERATE)
5+
add_definitions(-DACCELERATE_NEW_LAPACK)
6+
endif()
7+
38

49
set(CMAKE_C_STANDARD 11)
510
set(CMAKE_C_STANDARD_REQUIRED 11)
@@ -19,7 +24,6 @@ add_compile_options(-O3)
1924
add_compile_options(-march=native)
2025
add_compile_options(-D_GNU_SOURCE)
2126

22-
2327
# set(JEMALLOC_ROOT "/opt/homebrew/Cellar/jemalloc/5.3.0")
2428
# # Add jemalloc include directory
2529
# include_directories("${JEMALLOC_ROOT}/include")
@@ -34,6 +38,9 @@ target_include_directories(${PROJECT_NAME} PRIVATE
3438
)
3539
set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/main.c" PROPERTIES COMPILE_FLAGS "-O1")
3640

41+
if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
42+
target_compile_definitions(${PROJECT_NAME} PRIVATE ACCELERATE_NEW_LAPACK)
43+
endif()
3744
include(FindBLAS)
3845

3946
if (BLAS_FOUND)

Diff for: cmat.h

+4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@
55
#include <stdlib.h>
66
#include <string.h>
77
#include <math.h>
8+
#ifdef USE_ACCELERATE
9+
#include "cblas_new.h"
10+
#else
811
#include "cblas.h"
12+
#endif
913

1014
struct int_cmat {
1115
int* arena; // keep all the data in one arena

Diff for: matmul.h

+4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22
#define MATMUL_H
33

44
#include "cmat.h"
5+
#ifdef USE_ACCELERATE
6+
#include "cblas_new.h"
7+
#else
58
#include "cblas.h"
9+
#endif
610

711
int matmul_float(float_cmat matA, float_cmat matB, float_cmat matC);
812

0 commit comments

Comments
 (0)