Skip to content

Conversation

mkoeppe
Copy link
Contributor

@mkoeppe mkoeppe commented Jun 7, 2023

Fixes #4 (comment)

Manually triggered test run: https://github.com/mkoeppe/SCIP-SDP/actions/runs/5194662758
(the tests now fail because another one of our patches is incompatible with the changes in SCIP-SDP - see https://github.com/mkoeppe/SCIP-SDP/actions/runs/5194662758/jobs/9366583370#step:10:5123 .)

@mkoeppe mkoeppe force-pushed the ci-sage-update-2023-06 branch from e248a4b to 1d54896 Compare June 7, 2023 00:24
@mkoeppe mkoeppe force-pushed the ci-sage-update-2023-06 branch from 1d54896 to b93df4e Compare June 7, 2023 00:25
@pfetsch pfetsch merged commit f8c2a68 into scipopt:main Jun 7, 2023
@pfetsch
Copy link
Contributor

pfetsch commented Jun 7, 2023

Thanks for the fixes.

I think that the patches are old - or at least they should be incorporated. If not, I should include them here.

How can I remove multiple patches in the "REMOVE_PATCHES" line in the yml file?

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Jun 7, 2023

How can I remove multiple patches in the "REMOVE_PATCHES" line in the yml file?

Everything in the quotes just becomes part of a command-line of rm -f ..... So use whitespace-separated lists of files: "findlapack-09e79cf75146ca34c637f919d1f4527a63743300.patch abcdefg.patch" or any glob patterns like: "*"

@mkoeppe mkoeppe deleted the ci-sage-update-2023-06 branch June 7, 2023 17:02
@mkoeppe
Copy link
Contributor Author

mkoeppe commented Jun 7, 2023

I think that the patches are old - or at least they should be incorporated.

Not sure if I sent all of them to you via PR. The patches are at https://github.com/sagemath/sage/tree/develop/build/pkgs/scip_sdp/patches
In particular, not sure if I sent you the rpath patch

@pfetsch
Copy link
Contributor

pfetsch commented Jun 7, 2023

Thanks. I will check the rpath patch.

@pfetsch
Copy link
Contributor

pfetsch commented Jun 17, 2023

I check all the patches and they should be included.

The current errors all seem to happen because TBB does not install correctly.

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Jun 17, 2023

Right, tbb and also openblas on some platforms (known issue).
I'll look into upgrading our tbb package. Tests running at https://github.com/mkoeppe/SCIP-SDP/actions/runs/5298512526

vbraun pushed a commit to vbraun/sage that referenced this pull request Oct 1, 2023
sagemathgh-35786: onetbb: Upgrade to 2021.9.0 + GCC13 patch
    
<!-- Please provide a concise, informative and self-explanatory title.
-->
<!-- Don't put issue numbers in the title. Put it in the Description
below. -->
<!-- For example, instead of "Fixes sagemath#12345", use "Add a new method to
multiply two integers" -->

### 📚 Description

<!-- Describe your changes here in detail. -->
<!-- Why is this change required? What problem does it solve? -->
To fix build on fedora-39-minimal, archlinux-latest-{minimal,standard},
opensuse-tumbleweed-minimal - as seen in
https://github.com/scipopt/SCIP-SDP/actions/runs/5203680653
(scipopt/SCIP-SDP#6)

Tests at https://github.com/mkoeppe/SCIP-SDP/actions/runs/5298512526
<!-- If this PR resolves an open issue, please link to it here. For
example "Fixes sagemath#12345". -->
Part of:
-  sagemath#35092

<!-- If your change requires a documentation PR, please link it
appropriately. -->

### 📝 Checklist

<!-- Put an `x` in all the boxes that apply. It should be `[x]` not `[x
]`. -->

- [x] The title is concise, informative, and self-explanatory.
- [x] The description explains in detail what this PR is about.
- [x] I have linked a relevant issue or discussion.
- [ ] I have created tests covering the changes.
- [ ] I have updated the documentation accordingly.

### ⌛ Dependencies

<!-- List all open PRs that this PR logically depends on
- sagemath#12345: short description why this is a dependency
- sagemath#34567: ...
-->
- Depends on sagemath#35785 (merged here)

<!-- If you're unsure about any of these, don't hesitate to ask. We're
here to help! -->
    
URL: sagemath#35786
Reported by: Matthias Köppe
Reviewer(s): Dima Pasechnik
vbraun pushed a commit to sagemath/sage that referenced this pull request Oct 8, 2023
gh-35786: onetbb: Upgrade to 2021.9.0 + GCC13 patch
    
<!-- Please provide a concise, informative and self-explanatory title.
-->
<!-- Don't put issue numbers in the title. Put it in the Description
below. -->
<!-- For example, instead of "Fixes #12345", use "Add a new method to
multiply two integers" -->

### 📚 Description

<!-- Describe your changes here in detail. -->
<!-- Why is this change required? What problem does it solve? -->
To fix build on fedora-39-minimal, archlinux-latest-{minimal,standard},
opensuse-tumbleweed-minimal - as seen in
https://github.com/scipopt/SCIP-SDP/actions/runs/5203680653
(scipopt/SCIP-SDP#6)

Tests at https://github.com/mkoeppe/SCIP-SDP/actions/runs/5298512526
<!-- If this PR resolves an open issue, please link to it here. For
example "Fixes #12345". -->
Part of:
-  #35092

<!-- If your change requires a documentation PR, please link it
appropriately. -->

### 📝 Checklist

<!-- Put an `x` in all the boxes that apply. It should be `[x]` not `[x
]`. -->

- [x] The title is concise, informative, and self-explanatory.
- [x] The description explains in detail what this PR is about.
- [x] I have linked a relevant issue or discussion.
- [ ] I have created tests covering the changes.
- [ ] I have updated the documentation accordingly.

### ⌛ Dependencies

<!-- List all open PRs that this PR logically depends on
- #12345: short description why this is a dependency
- #34567: ...
-->
- Depends on #35785 (merged here)

<!-- If you're unsure about any of these, don't hesitate to ask. We're
here to help! -->
    
URL: #35786
Reported by: Matthias Köppe
Reviewer(s): Dima Pasechnik
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants