Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: IDAES/idaes-ext
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3.4.2
Choose a base ref
...
head repository: IDAES/idaes-ext
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
  • 3 commits
  • 5 files changed
  • 2 contributors

Commits on Aug 15, 2024

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    1416804 View commit details

Commits on Aug 19, 2024

  1. Copy the full SHA
    04ded57 View commit details
  2. Copy the full SHA
    f60f28b View commit details
Showing with 8 additions and 6 deletions.
  1. +1 −1 .github/workflows/test_linux.yml
  2. +1 −1 .github/workflows/test_macos_main.yml
  3. +1 −1 .github/workflows/test_windows_main.yml
  4. +3 −1 doc/build.md
  5. +2 −2 scripts/compile_solvers.sh
2 changes: 1 addition & 1 deletion .github/workflows/test_linux.yml
Original file line number Diff line number Diff line change
@@ -41,7 +41,7 @@ jobs:
conda create -n idaes python=3.9 pip psutil
conda activate idaes
pip install -r requirements-dev.txt
idaes get-extensions --nochecksum --url https://github.com/IDAES/idaes-ext/releases/download/test-release/ --distro ${{ matrix.bin_platform }} --extra petsc'
idaes get-extensions --nochecksum --url https://github.com/IDAES/idaes-ext/releases/download/3.4.2/ --distro ${{ matrix.bin_platform }} --extra petsc'
- name: Test IDAES-PSE
run: |
2 changes: 1 addition & 1 deletion .github/workflows/test_macos_main.yml
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ jobs:
cd idaes-pse
git checkout main
pip install -r requirements-dev.txt
idaes get-extensions --nochecksum --url https://github.com/IDAES/idaes-ext/releases/download/test-release/ --extra petsc
idaes get-extensions --nochecksum --url https://github.com/IDAES/idaes-ext/releases/download/3.4.2/ --extra petsc
- name: "Test IDAES-PSE"
run: |
cd idaes-pse/idaes
2 changes: 1 addition & 1 deletion .github/workflows/test_windows_main.yml
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ jobs:
cd idaes-pse
git checkout main
pip install -r requirements-dev.txt
idaes get-extensions --nochecksum --url https://github.com/IDAES/idaes-ext/releases/download/test-release/ --extra petsc
idaes get-extensions --nochecksum --url https://github.com/IDAES/idaes-ext/releases/download/3.4.2/ --extra petsc
- name: "Test IDAES-PSE"
shell: cmd
run: |
4 changes: 3 additions & 1 deletion doc/build.md
Original file line number Diff line number Diff line change
@@ -20,7 +20,9 @@ On Windows, except for one excpetion noted below the git Bash shell can be used.
4. From the a bash shell run `sh build.sh {flavor}` Replace `{flavor}` with the
platform (el7, el8, ubuntu1804, ubuntu2004, ubuntu2204, or windows). On ARM64
there is no el7 or windows.
5. Usually testing is done by GitHub actions and the testing images are built on
- **NOTE**: If you are behind certain corporate firewalls/proxies, you will
need to add lines to the beginning of the Dockerfiles for your SSL certificates.
6. Usually testing is done by GitHub actions and the testing images are built on
DockerHub, but ARM64 is not supported. If you need to build testing containers,
go to the test-platform directory and run `sh build.sh {platform}`. The platform
argument is slightly differnt than flavor. For testing it indicates a specific
4 changes: 2 additions & 2 deletions scripts/compile_solvers.sh
Original file line number Diff line number Diff line change
@@ -109,7 +109,7 @@ if [ ${GFMV[0]} -ge 10 ]; then
fi

# Fetch coin-or stuff and dependencies
SKIP_PKGS='ThirdParty/Lapack ThirdParty/Blas ThirdParty/glpk ThirdParty/Metis ThirdParty/Mumps'
SKIP_PKGS='ThirdParty/Lapack ThirdParty/Blas ThirdParty/Glpk ThirdParty/Metis ThirdParty/Mumps'
bash coinbrew fetch Clp --no-prompt --skip "$SKIP_PKGS"
bash coinbrew fetch Cbc --no-prompt --skip "$SKIP_PKGS"
SKIP_PKGS="$SKIP_PKGS Cbc Clp Cgl Osi"
@@ -131,7 +131,7 @@ if [ ${osname} = "el7" ]; then
# Looks like the only things in therd party are thing that Ipopt gets, so this should be ok.
rm -rf ./Thirdparty/*
fi
bash coinbrew fetch $IPOPT_REPO@$IPOPT_BRANCH --no-prompt --skip 'ThirdParty/Lapack ThirdParty/Blas ThirdParty/glpk'
bash coinbrew fetch $IPOPT_REPO@$IPOPT_BRANCH --no-prompt --skip 'ThirdParty/Lapack ThirdParty/Blas ThirdParty/Glpk'
cp -r Ipopt Ipopt_share

# Make sure I don't include any dependencies I don't want