Add macOS support #298
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -45,19 +45,19 @@ endif() | |
| # Get flags | ||
| # | ||
| execute_process( | ||
| COMMAND ${JULIA_EXECUTABLE} ${JULIA_SHARE}/julia-config.jl --cflags | ||
| OUTPUT_VARIABLE JULIA_CFLAGS | ||
| RESULT_VARIABLE RESULT | ||
| ) | ||
|
|
||
| execute_process( | ||
| COMMAND ${JULIA_EXECUTABLE} ${JULIA_SHARE}/julia-config.jl --ldflags | ||
| OUTPUT_VARIABLE JULIA_LDFLAGS | ||
| RESULT_VARIABLE RESULT | ||
| ) | ||
|
|
||
| execute_process( | ||
| COMMAND ${JULIA_EXECUTABLE} ${JULIA_SHARE}/julia-config.jl --ldlibs | ||
| OUTPUT_VARIABLE JULIA_LDLIBS | ||
| RESULT_VARIABLE RESULT | ||
| ) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -16,7 +16,7 @@ | |||||
|
|
||||||
| ### Prerequisites | ||||||
|
|
||||||
| Currently, libtrixi is developed and tested for Linux and macOS. Furthermore, the following | ||||||
|
Member
There was a problem hiding this comment.
Suggested change
|
||||||
| software packages need to be made available locally before installing libtrixi: | ||||||
| * [Julia](https://julialang.org/downloads/platform/) v1.8+ | ||||||
| * C compiler with support for C11 or later (e.g., [gcc](https://gcc.gnu.org/) or [clang](https://clang.llvm.org/)) | ||||||
|
|
||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,5 @@ | ||
| #include <stdio.h> | ||
| #include <inttypes.h> | ||
|
|
||
| #include <t8.h> | ||
| #include <t8_forest/t8_forest_general.h> | ||
|
|
@@ -22,7 +23,10 @@ void t8_print_forest_information (t8_forest_t forest) | |
| global_num_elements = t8_forest_get_global_num_elements (forest); | ||
|
|
||
| printf ("\n*** T8code *** Local number of elements:\t%i\n", local_num_elements); | ||
|
|
||
| // Using PRId64 to print t8_gloidx_t portably across platforms | ||
| printf ("*** T8code *** Global number of elements:\t%" PRId64 "\n", | ||
| global_num_elements); | ||
| } | ||
|
|
||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -53,30 +53,28 @@ optional arguments: | |
|
|
||
| --hdf5-library HDF5_LIBRARY | ||
| Path to the HDF5 shared library, i.e., something like | ||
| 'path/to/libhdf5.so' or 'path/to/libhdf5.dylib'. If empty, Julia | ||
| will try to figure out the path automatically. (default: '') | ||
|
|
||
| --mpi-library MPI_LIBRARY | ||
| Path to the MPI C shared library, i.e., something like | ||
| 'path/to/libmpi.so' or 'path/to/libmpi.dylib'. If empty, Julia will | ||
| try to figure out the path automatically. (default: '') | ||
|
|
||
| --t8code-library T8CODE_LIBRARY | ||
| Path to the t8code shared library, i.e., something like | ||
| 'path/to/libt8.so' or 'path/to/libt8.dylib'. If empty, Julia will | ||
| try to figure out the path automatically. (default: '') | ||
|
|
||
| --p4est-library P4EST_LIBRARY | ||
| Path to the p4est shared library, i.e., something like | ||
| 'path/to/libp4est.so' or 'path/to/libp4est.dylib'. If omitted, it | ||
| will be assumed to be located next to the t8code library. | ||
|
|
||
|
|
||
| --sc-library SC_LIBRARY | ||
| Path to the sc shared library, i.e., something like | ||
| 'path/to/libsc.so' or 'path/to/libsc.dylib'. If omitted, it will be | ||
| assumed to be located next to the t8code library. | ||
|
|
||
| EOF | ||
| } | ||
|
|
||
|
|
@@ -171,29 +169,50 @@ julia_exec="$LIBTRIXI_JULIA_EXEC" | |
| # Save Julia depot path | ||
| julia_depot="$LIBTRIXI_JULIA_DEPOT" | ||
|
|
||
| # Determine platform shared library suffix | ||
| case "$(uname -s)" in | ||
| Linux) | ||
| shared_library_suffix=so | ||
| ;; | ||
| Darwin) | ||
| shared_library_suffix=dylib | ||
| ;; | ||
| *) | ||
| shared_library_suffix=so | ||
| ;; | ||
| esac | ||
|
|
||
| # Check if the HDF5 library was given by the user or try to find it using Julia | ||
| if [ -z "$LIBTRIXI_HDF5_LIBRARY" ]; then | ||
| hdf5_library="$($julia_exec -e ' | ||
| using Libdl | ||
| path = find_library("libhdf5") | ||
| isempty(path) || println(dlpath(path))')" | ||
| if [ -z "$hdf5_library" ]; then | ||
| die "location of hdf5 library could not be determined; use --hdf5-library" | ||
| fi | ||
| else | ||
| hdf5_library="$LIBTRIXI_HDF5_LIBRARY" | ||
| fi | ||
| if [ ! -f "$hdf5_library" ]; then | ||
| die "hdf5 library '$hdf5_library' not found" 2 | ||
| fi | ||
| hdf5_libdir="$(dirname $hdf5_library)" | ||
| hdf5_hl_library="$hdf5_libdir/libhdf5_hl.$shared_library_suffix" | ||
| if [ ! -f "$hdf5_hl_library" ]; then | ||
| die "hdf5 library '$hdf5_hl_library' not found" 2 | ||
| fi | ||
|
|
||
| # Check if MPI library was given by the user or try to find it using Julia | ||
| if [ -z "$LIBTRIXI_MPI_LIBRARY" ]; then | ||
| mpi_library="$($julia_exec -e ' | ||
| using Libdl | ||
| libraries = ["libmpi", "libmpi_ibm", "msmpi", "libmpich", "libmpi_cray", | ||
| "libmpitrampoline"] | ||
| path = find_library(libraries) | ||
| isempty(path) || println(dlpath(path))')" | ||
| if [ -z "$mpi_library" ]; then | ||
| die "location of MPI library could not be determined; use --mpi-library" | ||
| fi | ||
| else | ||
| mpi_library="$LIBTRIXI_MPI_LIBRARY" | ||
|
|
@@ -202,41 +221,44 @@ if [ ! -f "$mpi_library" ]; then | |
| die "MPI library '$mpi_library' not found" 2 | ||
| fi | ||
|
|
||
| # Check if libt8 was given by the user or try to find it using Julia | ||
| if [ -z "$LIBTRIXI_T8CODE_LIBRARY" ]; then | ||
| t8code_libdir="$($julia_exec -e ' | ||
| using Libdl | ||
| path = find_library("libt8") | ||
| isempty(path) || println(dirname(dlpath(path)))')" | ||
| if [ -z "$t8code_libdir" ]; then | ||
| die "location of t8code library could not be determined; use --t8code-library" | ||
| fi | ||
| else | ||
| t8code_libdir="$(dirname $LIBTRIXI_T8CODE_LIBRARY)" | ||
| fi | ||
| t8code_libdir_abs="$(cd $t8code_libdir && pwd)" | ||
| t8code_library="$t8code_libdir_abs/libt8.$shared_library_suffix" | ||
| if [ ! -f "$t8code_library" ]; then | ||
| die "t8code library '$t8code_library' not found" 2 | ||
| fi | ||
|
|
||
| # Check if libp4est was given by the user or else assume it is next to libt8 | ||
| if [ -z "$LIBTRIXI_P4EST_LIBRARY" ]; then | ||
| p4est_libdir="$t8code_libdir" | ||
| else | ||
| p4est_libdir="$(dirname $LIBTRIXI_P4EST_LIBRARY)" | ||
| fi | ||
| p4est_libdir_abs="$(cd $p4est_libdir && pwd)" | ||
| p4est_library="$p4est_libdir_abs/libp4est.$shared_library_suffix" | ||
| if [ ! -f "$p4est_library" ]; then | ||
| die "p4est library '$p4est_library' not found" 2 | ||
| fi | ||
|
|
||
| # Check if libsc was given by the user or else assume it is next to libt8 | ||
| if [ -z "$LIBTRIXI_SC_LIBRARY" ]; then | ||
| sc_libdir="$t8code_libdir" | ||
| else | ||
| sc_libdir="$(dirname $LIBTRIXI_SC_LIBRARY)" | ||
| fi | ||
| sc_libdir_abs="$(cd $sc_libdir && pwd)" | ||
| sc_library="$sc_libdir_abs/libsc.$shared_library_suffix" | ||
| if [ ! -f "$sc_library" ]; then | ||
| die "sc library '$sc_library' not found" 2 | ||
| fi | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is to prevent deploying from PRs?