Skip to content

Commit

Permalink
Rename/move the brew formula for EPANETMSX compatibility.
Browse files Browse the repository at this point in the history
Also adds the ruby brew formula to the manifest for source distributions.
  • Loading branch information
dbhart committed Jan 10, 2025
1 parent 66c11ae commit 3cc239e
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/build_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ jobs:
python-version: ${{ matrix.python-version }}
- if: ${{ matrix.os == 'macos-latest' || matrix.os == 'macOS-13'}}
run: |
brew reinstall --build-from-source --formula ./shell/apple/libomp.rb
brew reinstall --build-from-source --formula wntr/epanet/libepanet/darwin-formula/libomp.rb
- name: Install dependencies
run: |
python --version
Expand Down
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ include wntr/sim/network_isolation/numpy.i
include wntr/tests/networks_for_testing/*.inp
include wntr/library/msx/*.json
include wntr/library/msx/*.msx
include wntr/epanet/libepanet/darwin-formula/libomp.rb
14 changes: 14 additions & 0 deletions documentation/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,20 @@ Step 2: Install WNTR
during the setup process. This requires that the user has a C++ compiler (e.g., Visual Studio C++, GNU C++, MinGW) on their path.
No compiler is needed when installing WNTR through PyPI (Option 1) or conda (Option 2).


.. note:: Mac builds and EPANETMSX

The builds of EPANETMSX for Mac require the OpenMP package be installed. This is easiest to do using
homebrew. A brew recipe is provided with WNTR that will obtain the appropriate libraries. To use it,
download the https://github.com/USEPA/WNTR/tree/main/wntr/epanet/libepanet/darwin-formula/libomp.rb
formula directly and brew it, or use the command below.
This should install the necessary libraries onto your machine to be able to run WNTR with EPANETMSX extensions.

.. code:: bash
brew reinstall --build-from-source --formula https://github.com/USEPA/WNTR/tree/main/wntr/epanet/libepanet/darwin-formula/libomp.rb


Step 3: Test installation
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

Expand Down
File renamed without changes.

0 comments on commit 3cc239e

Please sign in to comment.