Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Master release/1.9.0 #1748

Open
wants to merge 446 commits into
base: master
Choose a base branch
from
Open

Master release/1.9.0 #1748

wants to merge 446 commits into from

Conversation

MarcelKoch
Copy link
Member

@MarcelKoch MarcelKoch commented Dec 9, 2024 •
edited
Loading

This PR updates master to the latest state of develop. This is done by cherry-picking all commit between the v1.8.0 and v1.9.0 release, using:

git log --format=%H --no-merges --skip=1 --reverse <prev-release>..v1.9.0 | git cherry-pick --stdin

The commit for <prev-release> was found using:

git log --oneline --merges --first-parent --skip=1 -n 1 v1.9.0

In future releases, this should not be necessary, as the release tags can just be used directly.

Some conflicts needed to be resolved manually, but those were very few and only related to the tag name.

MarcelKoch and others added 30 commits December 9, 2024 16:59
@MarcelKoch
[core] remove unused #undef
8381a24
@upsj @MarcelKoch
temporarily disable oneAPI CI jobs
4b48ecb 
The runners are down for a short while
@MarcelKoch
Simplify the testing types
068c9eb 
Add template type functions to combine and merge type lists.
As a result, the GINKGO_DPCPP_SINGLE_MODE only needs to be present once.

Additionally, change the typen name ValueAndIndexType to ComplexAndPODTypes
(because gko::size_type is not an IndexType).
@MarcelKoch
Use new type aliases in relevant tests
007f394 
Additionally, introduce `IntegerTypes`, which is IndexTypes combined
with gko::size_type (used for the prefix sum tests).
@MarcelKoch
Add documentation for the new type alias
381a369
@MarcelKoch
Update documentation for type list helper
89d2d00 
Additionally, add tests for empty inputs.
@thoasm @MarcelKoch
Remove unsigned type from MPI bindings tests
e0b4be4
@thoasm @MarcelKoch
Properly format files
6dbac08
@thoasm @yhmtsai @MarcelKoch
Review updates
c05984b 
Co-authored-by: Yu-Hsiang M. Tsai <[email protected]>
@yhmtsai @MarcelKoch
squeeze memory dispatch
004eda0 
Co-authored-by: Marcel Koch <[email protected]>
@yhmtsai @MarcelKoch
clear unused version switch macro and change the badge
e955c62
@yhmtsai @MarcelKoch
add file config example with the configs
1249e17
@yhmtsai @MarcelKoch
update build.sh to c++17 in example
1e878e2 
Co-authored-by: Marcel Koch <[email protected]>
@yhmtsai @MarcelKoch
add test and update documentation
ee76a55 
Co-authored-by: Marcel Koch <[email protected]>
Co-authored-by: Thomas Grützmacher <[email protected]>
@yhmtsai @MarcelKoch
add missing example link
9be6dc1 
Co-authored-by: Marcel Koch <[email protected]>
@yhmtsai @greole @MarcelKoch
use milliseconds directly and update documentation
4855282 
Co-authored-by: Gregor Olenik <[email protected]>
@yhmtsai @MarcelKoch
fix windows execution test by using std::filesystem
db94214
@MarcelKoch
[core] allow filling the device_matrix_data
1e57673 
The main use case is in combination with `sum_duplicates` and `remove_zeros` to simplify the assembly setup.
@MarcelKoch
[core] remove zero initialization
bb4f732
@MarcelKoch
[batch] fix parameter ordering/naming
db1a492
@MarcelKoch
[fact] extract l/u initialization
e4b80ae
@MarcelKoch
[prec] implement SOR preconditioner reference kernels
601263d 
only reference kernels are available
@MarcelKoch
[prec] add SOR core + ref tests
22dcf40
@MarcelKoch
[prec] add sor parsing
e3848bb
@MarcelKoch
[prec] implement Gauß-Seidel preconditioner
fbdf417
@MarcelKoch
[prec] add gauss seidel parsing
741ca81
@MarcelKoch @yhmtsai
[sor] review updates:
f8ffb2c 
- documentation
- tests
- don't build upper solver if not symmetric

Co-authored-by: Yu-Hsiang M. Tsai <[email protected]>
@MarcelKoch
[prec] split up common impl of sor
c8a7dde
@MarcelKoch
[prec] implement omp sor kernels
198d294
@MarcelKoch
[prec] implement sycl sor kernels
86a430f
@MarcelKoch MarcelKoch self-assigned this Dec 9, 2024
@ginkgo-bot ginkgo-bot added reg:build This is related to the build system. reg:testing This is related to testing. reg:ci-cd This is related to the continuous integration system. reg:documentation This is related to documentation. reg:example This is related to the examples. reg:benchmarking This is related to benchmarking. type:solver This is related to the solvers type:preconditioner This is related to the preconditioners type:matrix-format This is related to the Matrix formats type:factorization This is related to the Factorizations type:reordering This is related to the matrix(LinOp) reordering reg:helper-scripts This issue/PR is related to the helper scripts mainly concerned with development of Ginkgo. type:multigrid This is related to multigrid type:stopping-criteria This is related to the stopping criteria mod:all This touches all Ginkgo modules. labels Dec 9, 2024
@MarcelKoch MarcelKoch requested a review from a team December 9, 2024 16:19
@upsj
Copy link
Member

upsj commented Dec 9, 2024

Would using git merge be an option? The worktree should look exactly the same as main, so merging should be possible.

@MarcelKoch
Copy link
Member Author

No, master and main don't have a common history since the 1.0 release. So merging main into master would introduce ~6000 commits.

@yhmtsai
Copy link
Member

yhmtsai commented Dec 10, 2024 •
edited
Loading

JOSS is failed due to old upload artifact.
we need to update it for main, too

@pratikvn
Copy link
Member

I think we can ignore the joss pandoc job for this and main branch. I think we can remove that job entirely in develop. I guess currently it has been setup to run on master and also on main somehow in the settings, which can probably be updated.

@MarcelKoch
Copy link
Member Author

TBH I don't know how the JOSS job was triggered. It should only run when files in doc/joss are changed, but this PR doesn't contain any changes there.
I also agree with @pratikvn that we can ignore it and should remove that job.

@MarcelKoch MarcelKoch mentioned this pull request Dec 10, 2024
Open
31 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yhmtsai yhmtsai yhmtsai approved these changes

@pratikvn pratikvn pratikvn approved these changes

At least 3 approving reviews are required to merge this pull request.

Assignees

@MarcelKoch MarcelKoch

Labels
mod:all This touches all Ginkgo modules. reg:benchmarking This is related to benchmarking. reg:build This is related to the build system. reg:ci-cd This is related to the continuous integration system. reg:documentation This is related to documentation. reg:example This is related to the examples. reg:helper-scripts This issue/PR is related to the helper scripts mainly concerned with development of Ginkgo. reg:testing This is related to testing. type:factorization This is related to the Factorizations type:matrix-format This is related to the Matrix formats type:multigrid This is related to multigrid type:preconditioner This is related to the preconditioners type:reordering This is related to the matrix(LinOp) reordering type:solver This is related to the solvers type:stopping-criteria This is related to the stopping criteria
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@MarcelKoch @upsj @yhmtsai @pratikvn @ginkgo-bot @thoasm @fritzgoebel @greole