| /petsc/doc/developers/ |
| H A D | mrfork.md | 3 # Checkout fork merge request branch
5 `Developers` at times, need to checkout and build changes from a merge request fork branch. Any one…
7 - Checkout `COMMIT-SHA` of the branch HEAD. It is available on the "Commits" tab of the merge reque…
14 …RL`. The `URL with branchname` is available as "Source branch" hyperlink on merge request web page.
21 - Setup a local Git clone to access the merge request branch via the `MR-NUMBER`. Here use the foll…
28 fetch = +refs/merge-requests/*:refs/remotes/origin/merge-requests/*
35 % git checkout origin/merge-requests/<MR-NUMBER>/head
38 # Commit and push changes to a merge request fork branch
40 Only `Owners/Maintainers` can push commits to a merge request fork branch. Here, use the `ssh-URL` …
52 For example, with `merge request` at <https://gitlab.com/petsc/petsc/-/merge_requests/8619> we have:
|
| H A D | mrmanagement.md | 6 "MR Shepherd" and ensures that open merge
8 examining open merge requests and taking appropriate action.
|
| H A D | communication.md | 10 [see or create merge requests](https://gitlab.com/petsc/petsc/-/merge_requests),
|
| H A D | style.md | 121 …itory with `make clangformat`. All merge requests must be properly formatted; this is automaticall…
123 …t must be constantly made. A subset of these is automatically checked for merge requests with `mak…
|
| /petsc/src/mat/impls/aij/mpi/ |
| H A D | mpimatmatmult.c | 1591 MatMergeSeqsToMPI *merge; in MatTransposeMatMultNumeric_MPIAIJ_MPIAIJ() local
1621 merge = ap->merge; in MatTransposeMatMultNumeric_MPIAIJ_MPIAIJ()
1625 coi = merge->coi; in MatTransposeMatMultNumeric_MPIAIJ_MPIAIJ()
1626 coj = merge->coj; in MatTransposeMatMultNumeric_MPIAIJ_MPIAIJ()
1628 bi = merge->bi; in MatTransposeMatMultNumeric_MPIAIJ_MPIAIJ()
1629 bj = merge->bj; in MatTransposeMatMultNumeric_MPIAIJ_MPIAIJ()
1630 owners = merge->rowmap->range; in MatTransposeMatMultNumeric_MPIAIJ_MPIAIJ()
1693 buf_ri = merge->buf_ri; in MatTransposeMatMultNumeric_MPIAIJ_MPIAIJ()
1694 buf_rj = merge->buf_rj; in MatTransposeMatMultNumeric_MPIAIJ_MPIAIJ()
1695 len_s = merge->len_s; in MatTransposeMatMultNumeric_MPIAIJ_MPIAIJ()
[all …]
|
| H A D | mpiaij.c | 4624 MatMergeSeqsToMPI *merge = *(MatMergeSeqsToMPI **)data; in MatMergeSeqsToMPIDestroy() local
4627 if (!merge) PetscFunctionReturn(PETSC_SUCCESS); in MatMergeSeqsToMPIDestroy()
4628 PetscCall(PetscFree(merge->id_r)); in MatMergeSeqsToMPIDestroy()
4629 PetscCall(PetscFree(merge->len_s)); in MatMergeSeqsToMPIDestroy()
4630 PetscCall(PetscFree(merge->len_r)); in MatMergeSeqsToMPIDestroy()
4631 PetscCall(PetscFree(merge->bi)); in MatMergeSeqsToMPIDestroy()
4632 PetscCall(PetscFree(merge->bj)); in MatMergeSeqsToMPIDestroy()
4633 PetscCall(PetscFree(merge->buf_ri[0])); in MatMergeSeqsToMPIDestroy()
4634 PetscCall(PetscFree(merge->buf_ri)); in MatMergeSeqsToMPIDestroy()
4635 PetscCall(PetscFree(merge->buf_rj[0])); in MatMergeSeqsToMPIDestroy()
[all …]
|
| H A D | mpiptap.c | 45 MatMergeSeqsToMPI *merge; in MatProductCtxDestroy_MPIAIJ_PtAP() local
70 merge = ptap->merge; in MatProductCtxDestroy_MPIAIJ_PtAP()
71 if (merge) { /* used by alg_ptap */ in MatProductCtxDestroy_MPIAIJ_PtAP()
72 PetscCall(PetscFree(merge->id_r)); in MatProductCtxDestroy_MPIAIJ_PtAP()
73 PetscCall(PetscFree(merge->len_s)); in MatProductCtxDestroy_MPIAIJ_PtAP()
74 PetscCall(PetscFree(merge->len_r)); in MatProductCtxDestroy_MPIAIJ_PtAP()
75 PetscCall(PetscFree(merge->bi)); in MatProductCtxDestroy_MPIAIJ_PtAP()
76 PetscCall(PetscFree(merge->bj)); in MatProductCtxDestroy_MPIAIJ_PtAP()
77 PetscCall(PetscFree(merge->buf_ri[0])); in MatProductCtxDestroy_MPIAIJ_PtAP()
78 PetscCall(PetscFree(merge->buf_ri)); in MatProductCtxDestroy_MPIAIJ_PtAP()
[all …]
|
| H A D | mpiaij.h | 30 MatMergeSeqsToMPI *merge; member
|
| /petsc/lib/petsc/bin/maint/ |
| H A D | check-merge-branch.sh | 20 base_release=$(git merge-base --octopus origin/release origin/main HEAD)
21 base_main=$(git merge-base origin/main HEAD)
|
| H A D | check-ci-settings.sh | 8 dest=$(lib/petsc/bin/maint/check-merge-branch.sh)
|
| H A D | check-each-commit.sh | 3 dest=$(lib/petsc/bin/maint/check-merge-branch.sh)
|
| /petsc/doc/developers/contributing/ |
| H A D | developingmr.md | 11 merge request.
140 branches and merge requests instead of all at once.
171 … you rebase since that will merge the old branch (from GitLab) into your local one and create a me…
181 …of your {any}`integration branch <sec_integration_branches>` [^rebase-not-merge-upstream], if the …
195 [^rebase-not-merge-upstream]: Rebasing is generally preferable to [merging an upstream branch](http…
197 [^block-ugly-pull-merge]: You may wish to [make it impossible to perform these usually-undesired "n…
|
| H A D | submittingmr.md | 5 `git push` prints a URL to the terminal that you can use to start a merge request.
9 - If the merge request resolves an outstanding [issue](https://gitlab.com/petsc/petsc/issues),
26 - Make sure the fork is public -- as GitLab merge request process does not work well with a private…
28 - Select the "Allow commits from members who can merge to the target branch" option.
89 When a sufficient number of reviewers has approved the merge, the pipeline passes, new commits have…
|
| H A D | pipelines.md | 10 The pipeline status for a merge request (MR) is displayed near the top of the MR page and in the pi…
18 Pipeline status for a merge request (MR)
|
| H A D | index.md | 13 All new code in PETSc is accepted via merge requests (MRs).
|
| /petsc/src/sys/yaml/ |
| H A D | README.md | 22 of code. This will make it quite easy to merge back upstream changes
25 recommend using a merge tool like [`meld`](https://meldmerge.org/) to
|
| H A D | License | 7 use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
|
| /petsc/ |
| H A D | CONTRIBUTING | 3 accepted via GitLab merge requests. Please see
8 the concept on a GitLab issue, merge request,
|
| H A D | makefile | 509 …$(PYTHON) ${PETSC_DIR}/lib/petsc/bin/maint/gcov.py --merge-branch `lib/petsc/bin/maint/check-merge…
|
| /petsc/src/mat/impls/composite/ |
| H A D | mcomposite.c | 17 PetscBool merge; member
331 if (shell->merge) PetscCall(MatCompositeMerge(Y)); in MatAssemblyEnd_Composite()
343 …-mat_composite_merge", "Merge at MatAssemblyEnd", "MatCompositeMerge", a->merge, &a->merge, NULL)); in MatSetFromOptions_Composite()
884 b->merge = PETSC_FALSE; in MatCreate_Composite()
|
| /petsc/lib/petsc/bin/maint/petsclinter/petsclinter/classes/ |
| H A D | _src_pos.py | 473 …def merge(cls, left: SourceRangeLike, right: SourceRangeLike, tu: Optional[clx.TranslationUnit] = … member in SourceRange
502 return self.merge(self, other, tu=self.translation_unit)
|
| H A D | _patch.py | 250 def merge(self, other: Patch) -> Patch: member in Patch
|
| /petsc/doc/install/ |
| H A D | license.md | 36 Contributions are accepted via [GitLab](https://gitlab.com/petsc/petsc) merge requests.
43 act of submitting a merge request (with or without an explicit Signed-off-by tag) will be
|
| /petsc/doc/community/ |
| H A D | mailing.md | 38 making your edits, and following the instructions to make a merge request. Merge requests for such …
|
| /petsc/lib/petsc/conf/ |
| H A D | rules_util.mk | 81 …@git diff --stat --exit-code `lib/petsc/bin/maint/check-merge-branch.sh`..HEAD -- src/sys/yaml/inc…
|