Skip to content

Commit aebbc8d

Browse files
DimitrisStaratzisDimitrisStaratzis
committed
add apple silicon .dylib to release jar
1 parent 905c1ef commit aebbc8d

File tree

7 files changed

+122
-23
lines changed

7 files changed

+122
-23
lines changed

‎.github/workflows/github_actions.yml‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ jobs:
4141
strategy:
4242
matrix:
4343
os: [ ubuntu-latest, macos-11, macos-13-xlarge ]
44-
4544
steps:
4645
- name: checkout
4746
uses: actions/checkout@v3
@@ -160,7 +159,7 @@ jobs:
160159
runs-on: ${{ matrix.os }}
161160
strategy:
162161
matrix:
163-
os: [ macos-11, ubuntu-latest ]
162+
os: [ macos-11, ubuntu-latest, macos-13-xlarge]
164163
steps:
165164
- name: checkout
166165
uses: actions/checkout@v3
@@ -175,10 +174,17 @@ jobs:
175174
docker run -e "CFLAGS=$CFLAGS" -e "CPPFLAGS=$CPPFLAGS" -v $(pwd):/TileDB-Java -t lib_builder_2010 /TileDB-Java/ci/build.sh
176175
cp ./build/tiledb_jni/*.so ./build/install/lib/*.so ./build/install/lib64/*.so binaries_$RUNNER_OS/
177176
fi
178-
179-
if [[ ( "$RUNNER_OS" == "macOS" ) ]]; then
180-
./gradlew -PTILEDB_AZURE=ON assemble
181-
cp ./build/tiledb_jni/*.dylib ./build/install/lib/*.dylib binaries_$RUNNER_OS/
177+
178+
if [[ "$RUNNER_OS" == "macOS" ]]; then
179+
if [[ "$(uname -m)" == "arm64" ]]; then
180+
echo "ARM Mac";
181+
mkdir binaries_$RUNNER_OS/arm
182+
./gradlew -PTILEDB_AZURE=ON assemble
183+
cp ./build/tiledb_jni/arm/*.dylib ./build/install/arm/lib/*.dylib binaries_$RUNNER_OS/arm
184+
else
185+
./gradlew -PTILEDB_AZURE=ON assemble
186+
cp ./build/tiledb_jni/*.dylib ./build/install/lib/*.dylib binaries_$RUNNER_OS/
187+
fi
182188
fi
183189
184190
name: 'Build and Upload (Ubuntu and OSX)'
@@ -242,8 +248,10 @@ jobs:
242248
mv Upload-*/* .
243249
244250
mkdir -p ./build/install/lib
251+
mkdir .build/install/arm/lib
245252
mkdir ./build/install/lib64
246253
mkdir ./build/tiledb_jni/
254+
mkdir ./build/tiledb_jni/arm
247255
mkdir ./build/tiledb_jni/Release
248256
mkdir ./build/install/bin
249257
@@ -258,6 +266,8 @@ jobs:
258266
# OSX
259267
mv libtiledb.dylib ./build/install/lib
260268
mv libtiledbjni.dylib ./build/tiledb_jni
269+
mv arm/libtiledb.dylib .build/install/arm/lib
270+
mv arm/libtiledbjni.dylib .build/tiledb_jni/arm
261271
262272
# Linux
263273
cp libtiledb.so ./build/install/lib

‎CMakeLists.txt‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,15 @@ if (TILEDB_JNI_SUPERBUILD)
6565
project(TileDB-JNI-Superbuild)
6666

6767
# Path to install everything to, for embedding in the jar.
68-
set(RESOURCE_INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/install")
68+
if (APPLE) # macOS
69+
if (CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
70+
set(RESOURCE_INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/install")
71+
else()
72+
set(RESOURCE_INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/install/arm")
73+
endif()
74+
else()
75+
set(RESOURCE_INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/install")
76+
endif()
6977

7078
message(STATUS "Starting TileDB-JNI superbuild.")
7179
include("cmake/TileDB-JNI-Superbuild.cmake")

‎build.gradle‎

Lines changed: 50 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,26 @@ dependencies {
4646
}
4747

4848
task cmakeTask(type: Exec) {
49-
File jniLibs = new File(buildDir.path + "/tiledb_jni")
50-
File tiledbLibs = new File(buildDir.path + "/install/lib")
49+
def osName = System.getProperty('os.name').toLowerCase()
50+
def arch = System.getProperty('os.arch').toLowerCase()
51+
52+
println "arch: "
53+
println arch;
54+
println osName;
55+
56+
File jniLibs;
57+
File tiledbLibs;
58+
59+
if (osName.contains("mac") && arch.equals("aarch64")) {
60+
println "mac arm building2";
61+
jniLibs = new File(buildDir.path + "/tiledb_jni/arm")
62+
tiledbLibs = new File(buildDir.path + "/install/arm/lib")
63+
}else{
64+
println " building2";
65+
66+
jniLibs = new File(buildDir.path + "/tiledb_jni")
67+
tiledbLibs = new File(buildDir.path + "/install/lib")
68+
}
5169

5270
onlyIf { !buildDir.exists() || !jniLibs.exists() || !tiledbLibs.exists() }
5371
doFirst {
@@ -83,8 +101,26 @@ task cmakeTask(type: Exec) {
83101
}
84102

85103
task cmakeBuildTask(type: Exec) {
86-
File jniLibs = new File(buildDir.path + "/tiledb_jni")
87-
File tiledbLibs = new File(buildDir.path + "/install/lib")
104+
def osName = System.getProperty('os.name').toLowerCase()
105+
def arch = System.getProperty('os.arch').toLowerCase()
106+
107+
println "arch: "
108+
println arch;
109+
println osName;
110+
111+
File jniLibs;
112+
File tiledbLibs;
113+
114+
if (osName.contains("mac") && arch.equals("aarch64")) {
115+
println "mac arm building";
116+
jniLibs = new File(buildDir.path + "/tiledb_jni/arm")
117+
tiledbLibs = new File(buildDir.path + "/install/arm/lib")
118+
}else{
119+
println " building";
120+
121+
jniLibs = new File(buildDir.path + "/tiledb_jni")
122+
tiledbLibs = new File(buildDir.path + "/install/lib")
123+
}
88124

89125
onlyIf { !buildDir.exists() || !jniLibs.exists() || !tiledbLibs.exists() }
90126
doFirst {
@@ -116,7 +152,7 @@ test {
116152
if (Os.isFamily(Os.FAMILY_WINDOWS)) {
117153
systemProperty "java.library.path", "$buildDir\\install\\bin;$buildDir\\tiledb_jni\\Release"
118154
} else {
119-
systemProperty "java.library.path", "$buildDir/install/lib:$buildDir/install/lib64:$buildDir/tiledb_jni"
155+
systemProperty "java.library.path", "$buildDir/install/lib:$buildDir/install/lib64:$buildDir/tiledb_jni:$buildDir/install/arm/lib:$buildDir/tiledb_jni/arm"
120156
}
121157

122158
testLogging {
@@ -125,12 +161,19 @@ test {
125161
}
126162

127163
jar {
164+
// macOS arm
165+
into(new File('arm/lib').toString()) {
166+
from file("$buildDir/install/arm/lib/libtiledb.dylib")
167+
from file("$buildDir/tiledb_jni/arm/libtiledbjni.dylib")
168+
}
169+
128170
into(new File('lib').toString()) {
129-
// Linux and macOS
171+
// Linux
130172
from file("$buildDir/install/lib/libtiledb.so")
131173
from file("$buildDir/install/lib64/libtiledb.so")
132174
from file("$buildDir/tiledb_jni/libtiledbjni.so")
133175

176+
// macOS intel
134177
from file("$buildDir/install/lib/libtiledb.dylib")
135178
from file("$buildDir/install/lib64/libtiledb.dylib")
136179
from file("$buildDir/tiledb_jni/libtiledbjni.dylib")
@@ -141,6 +184,7 @@ jar {
141184
from file("$buildDir/tiledb_jni/Release/tiledbjni.dll")
142185
}
143186

187+
144188
manifest {
145189
attributes("Implementation-Title": "Gradle",
146190
"Implementation-Version": archiveVersion)

‎cmake/TileDB-JNI-Superbuild.cmake‎

Lines changed: 34 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,37 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/FindTileDB_EP.cmake)
6060
# Set up the regular build (i.e. non-superbuild).
6161
############################################################
6262

63-
ExternalProject_Add(tiledb_jni
64-
SOURCE_DIR ${PROJECT_SOURCE_DIR}
65-
CMAKE_ARGS
66-
-DTILEDB_JNI_SUPERBUILD=OFF
67-
${INHERITED_CMAKE_ARGS}
68-
INSTALL_COMMAND ""
69-
BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/tiledb_jni
70-
DEPENDS ${TILEDB_JNI_EXTERNAL_PROJECTS}
71-
)
63+
if (APPLE) # macOS
64+
if (CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
65+
ExternalProject_Add(tiledb_jni
66+
SOURCE_DIR ${PROJECT_SOURCE_DIR}
67+
CMAKE_ARGS
68+
-DTILEDB_JNI_SUPERBUILD=OFF
69+
${INHERITED_CMAKE_ARGS}
70+
INSTALL_COMMAND ""
71+
BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/tiledb_jni/
72+
DEPENDS ${TILEDB_JNI_EXTERNAL_PROJECTS}
73+
)
74+
else()
75+
ExternalProject_Add(tiledb_jni
76+
SOURCE_DIR ${PROJECT_SOURCE_DIR}
77+
CMAKE_ARGS
78+
-DTILEDB_JNI_SUPERBUILD=OFF
79+
${INHERITED_CMAKE_ARGS}
80+
INSTALL_COMMAND ""
81+
BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/tiledb_jni/arm
82+
DEPENDS ${TILEDB_JNI_EXTERNAL_PROJECTS}
83+
)
84+
endif()
85+
else()
86+
ExternalProject_Add(tiledb_jni
87+
SOURCE_DIR ${PROJECT_SOURCE_DIR}
88+
CMAKE_ARGS
89+
-DTILEDB_JNI_SUPERBUILD=OFF
90+
${INHERITED_CMAKE_ARGS}
91+
INSTALL_COMMAND ""
92+
BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/tiledb_jni/
93+
DEPENDS ${TILEDB_JNI_EXTERNAL_PROJECTS}
94+
)
95+
endif()
96+

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ TILEDB_S3=ON
55
TILEDB_AZURE=OFF
66
TILEDB_HDFS=OFF
77
TILEDB_SERIALIZATION=OFF
8-
FORCE_BUILD_TILEDB=OFF
8+
FORCE_BUILD_TILEDB=ON
99
DOWNLOAD_TILEDB_PREBUILT=ON
1010
TILEDB_SKIP_S3AWSSDK_DIR_LENGTH_CHECK=ON

‎src/main/java/io/tiledb/libtiledb/NativeLibLoader.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,12 @@ private static Path extractLibraryFile(
322322
private static Path findNativeLibrary(String libraryName, boolean mapLibraryName) {
323323
String mappedLibraryName = mapLibraryName ? System.mapLibraryName(libraryName) : libraryName;
324324
String libDir = LIB_RESOURCE_DIR;
325+
326+
if (System.getProperty("os.name").contains("mac")
327+
&& System.getProperty("os.arch").equals("aarch64")) {
328+
libDir = "arm" + libDir;
329+
}
330+
325331
String libPath = libDir + "/" + mappedLibraryName;
326332

327333
boolean hasNativeLib = hasResource(libPath);

‎swig/customCode/NativeLibLoader.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,12 @@ private static Path extractLibraryFile(
322322
private static Path findNativeLibrary(String libraryName, boolean mapLibraryName) {
323323
String mappedLibraryName = mapLibraryName ? System.mapLibraryName(libraryName) : libraryName;
324324
String libDir = LIB_RESOURCE_DIR;
325+
326+
if (System.getProperty("os.name").contains("mac")
327+
&& System.getProperty("os.arch").equals("aarch64")) {
328+
libDir = "arm" + libDir;
329+
}
330+
325331
String libPath = libDir + "/" + mappedLibraryName;
326332

327333
boolean hasNativeLib = hasResource(libPath);

0 commit comments

Comments
 (0)