Skip to content

Commit

Permalink
Fixed and updated the mac version
Browse files Browse the repository at this point in the history
MattHazard committed Feb 7, 2024
1 parent 13cbb18 commit d016559
Showing 17 changed files with 31 additions and 10 deletions.
4 changes: 4 additions & 0 deletions PRTC/PRTC.cpp
Original file line number Diff line number Diff line change
@@ -224,7 +224,11 @@ JNIEXPORT jlongArray JNICALL Java_edu_abc_berkeley_PRTC_getImageDims (JNIEnv *en
uint64_t* dims = getImageSize(fName);
env->ReleaseStringUTFChars(fileName, fName);
jlongArray rval = env->NewLongArray(3);
#ifdef __APPLE__
env->SetLongArrayRegion(rval,0,3,(long int*)dims);
#else
env->SetLongArrayRegion(rval,0,3,(int64_t*)dims);
#endif
free(dims);
return rval;

9 changes: 6 additions & 3 deletions PRTC/gccMac.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
/usr/local/bin/gcc-12 -O3 -fopenmp -fPIC -DPIC PRTC.c parallelReadTiff.c -I/Library/Java/JavaVirtualMachines/jdk-19.jdk/Contents/Home/include -I/Library/Java/JavaVirtualMachines/jdk-19.jdk/Contents/Home/include/darwin -I/usr/local/include -L/usr/local/lib -shared -o libpReadTiffC.dylib -ltiff

STATIC:
/usr/local/bin/gcc-13 -O3 -fopenmp -fPIC -DPIC PRTC.c parallelReadTiff.c -I/Library/Java/JavaVirtualMachines/jdk-19.jdk/Contents/Home/include -I/Library/Java/JavaVirtualMachines/jdk-19.jdk/Contents/Home/include/darwin -I/usr/local/include -L/usr/local/lib -shared -o libpReadTiffC.dylib /usr/local/lib/libtiff.a /usr/local/lib/libzstd.a /usr/local/lib/liblzma.a /usr/local/lib/libdeflate.a /usr/local/Cellar/lib/1.2.13/lib/libz.a /usr/local/opt/gcc/lib/gcc/current/libgomp.a -static-libgcc -static-libstdc++
/usr/local/bin/gcc-13 -O3 -fopenmp -fPIC -DPIC PRTC.c parallelReadTiff.c -I/Library/Java/JavaVirtualMachines/jdk-19.jdk/Contents/Home/include -I/Library/Java/JavaVirtualMachines/jdk-19.jdk/Contents/Home/include/darwin -I/usr/local/include -L/usr/local/lib -shared -o libpReadTiffC.dylib /usr/local/lib/libtiff.a /usr/local/lib/libzstd.a /usr/local/lib/liblzma.a /usr/local/lib/libdeflate.a /usr/local/Cellar/lib/1.2.13/lib/libz.a /usr/local/opt/gcc/lib/gcc/current/libgomp.a -static-libgcc -static-libstdc++

CURRENT:
/usr/local/bin/g++-13 -O3 -fopenmp -fPIC -DPIC PRTC.cpp -I/Library/Java/JavaVirtualMachines/jdk-19.jdk/Contents/Home/include -I/Library/Java/JavaVirtualMachines/jdk-19.jdk/Contents/Home/include/darwin -I/usr/local/include -L/usr/local/lib -shared -o libpReadTiffC.dylib -lcppTiff -static-libgcc -static-libstdc++

install_name_tool -change @rpath/libcppTiff.dylib @loader_path/libcppTiff.dylib libpReadTiffC.dylib
Binary file added PRTC/libpReadTiffC.dylib
Binary file not shown.
4 changes: 4 additions & 0 deletions PRZC/PRZC.cpp
Original file line number Diff line number Diff line change
@@ -209,7 +209,11 @@ JNIEXPORT jlongArray JNICALL Java_edu_abc_berkeley_PRZC_getImageDims (JNIEnv *en
zarr Zarr(fName);
uint64_t dims[3] = {Zarr.get_shape(0),Zarr.get_shape(1),Zarr.get_shape(2)};
jlongArray rval = env->NewLongArray(3);
#ifdef __APPLE__
env->SetLongArrayRegion(rval,0,3,(long int*)dims);
#else
env->SetLongArrayRegion(rval,0,3,(int64_t*)dims);
#endif
env->ReleaseStringUTFChars(fileName, fName);
return rval;
}
7 changes: 5 additions & 2 deletions PRZC/gccMac.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
/usr/local/bin/gcc-12 -O3 -fopenmp -fPIC -DPIC PRZC.c parallelReadZarr.c -I/Library/Java/JavaVirtualMachines/jdk-19.jdk/Contents/Home/include -I/Library/Java/JavaVirtualMachines/jdk-19.jdk/Contents/Home/include/darwin -I/usr/local/include -L/usr/local/lib -shared -o libpReadZarrC.dylib -luuid -lblosc2 -lblosc -lcjson -lz

STATIC:
/usr/local/bin/gcc-13 -O3 -fopenmp -fPIC -DPIC PRZC.c parallelReadZarr.c -I/Library/Java/JavaVirtualMachines/jdk-19.jdk/Contents/Home/include -I/Library/Java/JavaVirtualMachines/jdk-19.jdk/Contents/Home/include/darwin -I/usr/local/include -L/usr/local/lib -shared -o libpReadZarrC.dylib /usr/local/lib/libblosc2.a /usr/local/lib/libcjson.a /usr/local/Cellar/zlib/1.2.13/lib/libz.a /usr/local/opt/gcc/lib/gcc/current/libgomp.a -static-libgcc -static-libstdc++

CURRENT:
/usr/local/bin/g++-13 -O3 -fopenmp -fPIC -DPIC PRZC.cpp -I/Library/Java/JavaVirtualMachines/jdk-19.jdk/Contents/Home/include -I/Library/Java/JavaVirtualMachines/jdk-19.jdk/Contents/Home/include/darwin -I/usr/local/include -L/usr/local/lib -shared -o libpReadZarrC.dylib -lcppZarr -static-libgcc -static-libstdc++

install_name_tool -change @rpath/libcppZarr.dylib @loader_path/libcppZarr.dylib libpReadZarrC.dylib
Binary file modified PRZC/libpReadZarrC.dylib
Binary file not shown.
9 changes: 6 additions & 3 deletions PWTC/gccMac.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
/usr/local/bin/gcc-12 -O3 -fopenmp -fPIC -DPIC PWTC.c parallelWriteTiff.c lzwEncode.c -I/Library/Java/JavaVirtualMachines/jdk-19.jdk/Contents/Home/include -I/Library/Java/JavaVirtualMachines/jdk-19.jdk/Contents/Home/include/darwin -I/usr/local/include -L/usr/local/lib -shared -o libpWriteTiffC.dylib -ltiff

STATIC:
/usr/local/bin/gcc-13 -O3 -fopenmp -fPIC -DPIC PWTC.c parallelWriteTiff.c lzwEncode.c -I/Library/Java/JavaVirtualMachines/jdk-19.jdk/Contents/Home/include -I/Library/Java/JavaVirtualMachines/jdk-19.jdk/Contents/Home/include/darwin -I/usr/local/include -L/usr/local/lib -shared -o libpWriteTiffC.dylib /usr/local/lib/libtiff.a /usr/local/lib/libzstd.a /usr/local/lib/liblzma.a /usr/local/lib/libdeflate.a /usr/local/Cellar/zlib/1.2.13/lib/libz.a /usr/local/opt/gcc/lib/gcc/current/libgomp.a -static-libgcc -static-libstdc++
/usr/local/bin/gcc-13 -O3 -fopenmp -fPIC -DPIC PWTC.c parallelWriteTiff.c lzwEncode.c -I/Library/Java/JavaVirtualMachines/jdk-19.jdk/Contents/Home/include -I/Library/Java/JavaVirtualMachines/jdk-19.jdk/Contents/Home/include/darwin -I/usr/local/include -L/usr/local/lib -shared -o libpWriteTiffC.dylib /usr/local/lib/libtiff.a /usr/local/lib/libzstd.a /usr/local/lib/liblzma.a /usr/local/lib/libdeflate.a /usr/local/Cellar/zlib/1.2.13/lib/libz.a /usr/local/opt/gcc/lib/gcc/current/libgomp.a -static-libgcc -static-libstdc++

CURRENT:
/usr/local/bin/g++-13 -O3 -fopenmp -fPIC -DPIC PWTC.cpp -I/Library/Java/JavaVirtualMachines/jdk-19.jdk/Contents/Home/include -I/Library/Java/JavaVirtualMachines/jdk-19.jdk/Contents/Home/include/darwin -I/usr/local/include -L/usr/local/lib -shared -o libpWriteTiffC.dylib -lcppTiff -static-libgcc -static-libstdc++

install_name_tool -change @rpath/libcppTiff.dylib @loader_path/libcppTiff.dylib libpWriteTiffC.dylib
Binary file modified PWTC/libpWriteTiffC.dylib
Binary file not shown.
8 changes: 6 additions & 2 deletions PWZC/gccMac.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
/usr/local/bin/gcc-12 -O3 -fopenmp -fPIC -DPIC PWZC.c parallelWriteZarr.c helperFunctions.c parallelReadZarr.c -I/Library/Java/JavaVirtualMachines/jdk-19.jdk/Contents/Home/include -I/Library/Java/JavaVirtualMachines/jdk-19.jdk/Contents/Home/include/darwin -I/usr/local/include -L/usr/local/lib -shared -o libpWriteZarrC.dylib -luuid -lblosc2 -lblosc -lcjson -lz

STATIC:
/usr/local/bin/gcc-13 -O3 -fopenmp -fPIC -DPIC PWZC.c parallelWriteZarr.c helperFunctions.c parallelReadZarr.c -I/Library/Java/JavaVirtualMachines/jdk-19.jdk/Contents/Home/include -I/Library/Java/JavaVirtualMachines/jdk-19.jdk/Contents/Home/include/darwin -I/usr/local/include -L/usr/local/lib -shared -o libpWriteZarrC.dylib /usr/local/lib/libblosc2.a /usr/local/lib/libblosc.a /usr/local/lib/libcjson.a /usr/local/Cellar/zlib/1.2.13/lib/libz.a /usr/local/opt/gcc/lib/gcc/current/libgomp.a /usr/local/lib/libuuid.a -static-libgcc -static-libstdc++

CURRENT:

/usr/local/bin/g++-13 -O3 -fopenmp -fPIC -DPIC PWZC.cpp -I/Library/Java/JavaVirtualMachines/jdk-19.jdk/Contents/Home/include -I/Library/Java/JavaVirtualMachines/jdk-19.jdk/Contents/Home/include/darwin -I/usr/local/include -L/usr/local/lib -shared -o libpWriteZarrC.dylib -lcppZarr -static-libgcc -static-libstdc++

install_name_tool -change @rpath/libcppZarr.dylib @loader_path/libcppZarr.dylib libpWriteZarrC.dylib
Binary file modified PWZC/libpWriteZarrC.dylib
Binary file not shown.
Binary file added mac/Parallel_Fiji_Visualizer_lib/libcppTiff.dylib
Binary file not shown.
Binary file added mac/Parallel_Fiji_Visualizer_lib/libcppZarr.dylib
Binary file not shown.
Binary file added mac/Parallel_Fiji_Visualizer_lib/libgomp.1.dylib
Binary file not shown.
Binary file modified mac/Parallel_Fiji_Visualizer_lib/libpReadTiffC.dylib
Binary file not shown.
Binary file modified mac/Parallel_Fiji_Visualizer_lib/libpReadZarrC.dylib
Binary file not shown.
Binary file modified mac/Parallel_Fiji_Visualizer_lib/libpWriteTiffC.dylib
Binary file not shown.
Binary file modified mac/Parallel_Fiji_Visualizer_lib/libpWriteZarrC.dylib
Binary file not shown.

0 comments on commit d016559

Please sign in to comment.