Skip to content

Commit

Permalink
Merge pull request #178 from MeasureTransport/dannys4/remove_julia_he…
Browse files Browse the repository at this point in the history
…aders

Remove julia headers
  • Loading branch information
mparno authored Jul 29, 2022
2 parents 7e138bc + 1bc9f2b commit 0522c6e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 15 deletions.
5 changes: 2 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ set(CMAKE_CXX_FLAGS_RELEASE "-O3")
option(BUILD_SHARED_LIBS "Build using shared libraries" ON)

##############################################################
# RPATH settings
# RPATH settings

# use, i.e. don't skip the full RPATH for the build tree
set(CMAKE_SKIP_BUILD_RPATH FALSE)
Expand Down Expand Up @@ -108,7 +108,6 @@ if(MPART_JULIA)
endif()
execute_process(COMMAND ${JULIA_EXE} -e "using CxxWrap; print(CxxWrap.prefix_path())" OUTPUT_VARIABLE cxxwrap_location)
list(APPEND CMAKE_PREFIX_PATH "${cxxwrap_location}/lib/cmake/JlCxx/" )

find_package(JlCxx)

if(NOT JlCxx_FOUND)
Expand All @@ -119,7 +118,7 @@ if(MPART_JULIA)
get_filename_component(JlCxx_location ${JlCxx_location} DIRECTORY)
get_filename_component(JlCxx_src ${JlCxx_location} DIRECTORY)
set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib;${JlCxx_location}")
include_directories(${Julia_INCLUDE_DIRS} ${JlCxx_src}/include)
include_directories(${JlCxx_src}/include)
endif()

endif()
Expand Down
17 changes: 5 additions & 12 deletions docs/source/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -106,21 +106,14 @@ If you have Julia installed, but CMake was not able to find it during MParT conf

To prevent the Julia bindings from being compiled, even if Julia and CxxWrap are found, set :code:`MPART_JULIA=OFF` during the CMake configuration.

Once MParT is installed with Julia bindings (i.e. :code:`MPART_JULIA=ON`) into :code:`<your MParT install path>/julia/`, you can easily use :code:`mpart` in Julia by first adding the path to your library path
Once MParT is installed with Julia bindings (i.e. :code:`MPART_JULIA=ON`) into :code:`your/MParT/install/path`, you can using MParT in Julia with a few last steps. First, add :code:`MParT.jl`, which holds the Julia interface for MParT, via :code:`]add https://github.com/MeasureTransport/MParT.jl` in the Julia REPL. Then, create a file :code:`~/.julia/artifacts/Override.toml` with the following lines

.. tabbed:: MacOS
.. code-block:: toml
.. code-block:: bash
$ export DYLD_LIBRARY_PATH=<your MParT install path>/julia/mpart/:$DYLD_LIBRARY_PATH
$ export JULIA_LOAD_PATH="<your MParT install path>/julia/mpart/:$JULIA_LOAD_PATH"
.. tabbed:: Linux

.. code-block:: bash
[bee5971c-294f-5168-9fcd-9fb3c811d495]
MParT = "your/MParT/install/path"
$ export LD_LIBRARY_PATH=<your MParT install path>/julia/mpart/:$LD_LIBRARY_PATH
$ export JULIA_LOAD_PATH="<your MParT install path>/julia/mpart/:$JULIA_LOAD_PATH"
At this point, you should be able to open up a REPL and type :code:`using MParT` and get going with any of the provided examples!

Compiling with CUDA Support
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Expand Down

0 comments on commit 0522c6e

Please sign in to comment.