Skip to content

ci: replace conda testing with pixi #554

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
Merged
cpcloud merged 1 commit into from
Nov 3, 2025
Merged

ci: replace conda testing with pixi #554

cpcloud merged 1 commit into from
Nov 3, 2025

Conversation

@cpcloud
Copy link
Contributor

@cpcloud cpcloud commented Oct 27, 2025

This PR moves our conda CI to use pixi in order to speed it up. Based off of #551.

@copy-pr-bot
Copy link

copy-pr-bot bot commented Oct 27, 2025

Auto-sync is disabled for draft pull requests in this repository. Workflows must be run manually.

Contributors can view more details about this message here.

@cpcloud
Copy link
Contributor Author

cpcloud commented Oct 27, 2025

/ok to test

1 similar comment
@cpcloud
Copy link
Contributor Author

cpcloud commented Oct 27, 2025

/ok to test

@cpcloud cpcloud changed the title replace conda ci with pixi ci: replace conda testing with pixi Oct 27, 2025
@cpcloud
Copy link
Contributor Author

cpcloud commented Oct 27, 2025

/ok to test

1 similar comment
@cpcloud
Copy link
Contributor Author

cpcloud commented Oct 27, 2025

/ok to test

@cpcloud cpcloud force-pushed the replace-conda-ci-with-pixi branch from e18f1fd to 67d363b Compare October 27, 2025 15:51
@cpcloud
Copy link
Contributor Author

cpcloud commented Oct 27, 2025

/ok to test

@cpcloud cpcloud mentioned this pull request Oct 27, 2025
Merged
@cpcloud
Copy link
Contributor Author

cpcloud commented Oct 27, 2025

/ok to test

2 similar comments
@cpcloud
Copy link
Contributor Author

cpcloud commented Oct 27, 2025

/ok to test

@cpcloud
Copy link
Contributor Author

cpcloud commented Oct 27, 2025

/ok to test

@gmarkall gmarkall added the 2 - In Progress Currently a work in progress label Oct 29, 2025
@cpcloud cpcloud force-pushed the replace-conda-ci-with-pixi branch 2 times, most recently from 0d16a3c to 8967515 Compare October 30, 2025 14:08
@cpcloud
Copy link
Contributor Author

cpcloud commented Oct 30, 2025

/ok to test

@cpcloud cpcloud force-pushed the replace-conda-ci-with-pixi branch from 40ed36b to 597b67f Compare October 30, 2025 15:05
@cpcloud
Copy link
Contributor Author

cpcloud commented Oct 30, 2025

/ok to test

2 similar comments
@cpcloud
Copy link
Contributor Author

cpcloud commented Oct 30, 2025

/ok to test

@cpcloud
Copy link
Contributor Author

cpcloud commented Oct 30, 2025

/ok to test

@cpcloud cpcloud force-pushed the replace-conda-ci-with-pixi branch from f8ad34a to 737366a Compare October 31, 2025 15:08
@cpcloud
Copy link
Contributor Author

cpcloud commented Oct 31, 2025

/ok to test

@cpcloud cpcloud marked this pull request as ready for review October 31, 2025 20:40
@cpcloud cpcloud requested a review from kkraus14 October 31, 2025 20:40
@copy-pr-bot
Copy link

copy-pr-bot bot commented Oct 31, 2025

Auto-sync is disabled for ready for review pull requests in this repository. Workflows must be run manually.

Contributors can view more details about this message here.

@cpcloud
Copy link
Contributor Author

cpcloud commented Oct 31, 2025

/ok to test

2 similar comments
@cpcloud
Copy link
Contributor Author

cpcloud commented Oct 31, 2025

/ok to test

@cpcloud
Copy link
Contributor Author

cpcloud commented Oct 31, 2025

/ok to test

@cpcloud cpcloud force-pushed the replace-conda-ci-with-pixi branch from ee58f5d to a15c55f Compare October 31, 2025 20:58
@cpcloud
Copy link
Contributor Author

cpcloud commented Oct 31, 2025

/ok to test

@cpcloud cpcloud force-pushed the replace-conda-ci-with-pixi branch from 1c495c5 to d29349f Compare November 3, 2025 15:43
@cpcloud
Copy link
Contributor Author

cpcloud commented Nov 3, 2025

/ok to test

1 similar comment
@cpcloud
Copy link
Contributor Author

cpcloud commented Nov 3, 2025

/ok to test

@cpcloud cpcloud force-pushed the replace-conda-ci-with-pixi branch from 223782a to f9ee100 Compare November 3, 2025 16:54
@cpcloud
Copy link
Contributor Author

cpcloud commented Nov 3, 2025

/ok to test

cpcloud
cpcloud commented Nov 3, 2025
View reviewed changes
pixi.toml
[pypi-dependencies]
numba-cuda = { path = ".", editable = true }
[workspace.build-variants]
python = ["3.10.*", "3.11.*", "3.12.*", "3.13.*"]
Copy link
Contributor Author

@cpcloud cpcloud Nov 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These can't quite be used yet because of prefix-dev/pixi#4877.

@cpcloud
Copy link
Contributor Author

cpcloud commented Nov 3, 2025

/ok to test

cpcloud
cpcloud commented Nov 3, 2025
View reviewed changes
@cpcloud
Copy link
Contributor Author

cpcloud commented Nov 3, 2025

Looking at a random PR build without this change: https://github.com/NVIDIA/numba-cuda/actions/runs/19040099227/job/54375099989

I see test-conda job durations of >= 6 minutes, whereas after this PR jobs are 2-3 minutes (which includes the pixi setup time), so there's a 2-3x speed up here by moving to pixi, likely from avoiding the solve on every job.

cpcloud
cpcloud commented Nov 3, 2025
View reviewed changes
kkraus14
kkraus14 reviewed Nov 3, 2025
View reviewed changes
ci/test_conda.sh
if [ "${RAPIDS_DEPENDENCIES:-}" = "oldest" ]; then
DEPENDENCIES+=("numba==0.60.0")
# add to the default environment's dependencies
pixi add "numba=0.60.0"
Copy link
Contributor

@kkraus14 kkraus14 Nov 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a way we can have this version somewhere in the pixi.toml or something else not buried in a ci script to make it more easily testable / reproducible outside of CI?

Copy link
Contributor Author

@cpcloud cpcloud Nov 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suppose I could make another environment with this as a dependency.

Copy link
Contributor

@kkraus14 kkraus14 Nov 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that makes the most sense. Something like numba_oldest.

Copy link
Contributor Author

@cpcloud cpcloud Nov 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, since it's in the matrix I would have to make one for every cuda + python verison marked 'oldest' in matrix.yml.

Copy link
Contributor Author

@cpcloud cpcloud Nov 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's possible for sure. It might be a pain to maintain. Can we do that in a follow-up?

pixi.toml
Comment on lines +30 to +31
[feature.cu-12-0.dependencies]
cuda-version = "12.0.*"
Copy link
Contributor

@kkraus14 kkraus14 Nov 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know if using cuda-version can pin to specific minor versions. I.E. libnvjitlink allows floating forward intentionally for better environment compatibility: https://github.com/conda-forge/libnvjitlink-feedstock/blob/main/recipe/meta.yaml#L54

May need to pin to specific minor versions of the various libraries.

Copy link
Contributor Author

@cpcloud cpcloud Nov 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is no different than the status quo, so can we do it in a follow-up?

The previous conda setup did the same kind of variable substitution of CUDA_VER to work around the lack of specific versions on conda-forge that are listed in matrix.yml, e.g., 12.0.1.

@cpcloud cpcloud force-pushed the replace-conda-ci-with-pixi branch from 8b82bb4 to 36db80a Compare November 3, 2025 19:09
@cpcloud cpcloud force-pushed the replace-conda-ci-with-pixi branch from 36db80a to 3b13abe Compare November 3, 2025 19:11
@cpcloud
Copy link
Contributor Author

cpcloud commented Nov 3, 2025

/ok to test

@cpcloud cpcloud enabled auto-merge (squash) November 3, 2025 21:27
@cpcloud cpcloud added 4 - Waiting on CI Waiting for a CI run to finish successfully and removed 2 - In Progress Currently a work in progress labels Nov 3, 2025
@cpcloud
Copy link
Contributor Author

cpcloud commented Nov 3, 2025

I'll remove the dependency of the test-conda job on build-conda in a follow-up, since after this PR we're effectively building a conda package with each pixi run that requires it.

@cpcloud cpcloud merged commit b43dcc8 into NVIDIA:main Nov 3, 2025
70 checks passed
@cpcloud cpcloud deleted the replace-conda-ci-with-pixi branch November 3, 2025 22:08
@cpcloud
Copy link
Contributor Author

cpcloud commented Nov 3, 2025

Just realized that this is all testing only python 3.13.

Fix incoming.

gmarkall added a commit to gmarkall/numba-cuda that referenced this pull request Nov 20, 2025
@gmarkall
Bump version to 0.21.0
47f05e1 
- Add support for cache-hinted load and store operations (NVIDIA#587)
- Add more thirdparty tests (NVIDIA#586)
- Add sphinx-lint to pre-commit and fix errors (NVIDIA#597)
- Add DWARF variant part support for polymorphic variables in CUDA debug info (NVIDIA#544)
- chore: clean up dead workaround for unavailable `lru_cache` (NVIDIA#598)
- chore(docs): format types docs (NVIDIA#596)
- refactor: decouple `Context` from `Stream` and `Event` objects (NVIDIA#579)
- Fix freezing in of constant arrays with negative strides (NVIDIA#589)
- Update tests to accept variants of generated PTX (NVIDIA#585)
- refactor: replace device functionality with `cuda.core` APIs (NVIDIA#581)
- Move frontend tests to `cudapy` namespace (NVIDIA#558)
- Generalize the concurrency group for main merges (NVIDIA#582)
- ci: move pre-commit checks to pre commit action (NVIDIA#577)
- chore(pixi): set up doc builds; remove most `build-conda` dependencies (NVIDIA#574)
- ci: ensure that python version in ci matches matrix (NVIDIA#575)
- Fix the `cuda.is_supported_version()` API (NVIDIA#571)
- Fix checks on main (NVIDIA#576)
- feat: add `math.nextafter` (NVIDIA#543)
- ci: replace conda testing with pixi (NVIDIA#554)
- [CI] Run PR workflow on merge to main (NVIDIA#572)
- Propose Alternative Module Path for `ext_types` and Maintain `numba.cuda.types.bfloat16` Import API (NVIDIA#569)
- test: enable fail-on-warn and clean up resulting failures (NVIDIA#529)
- [Refactor][NFC] Vendor-in compiler_lock for future CUDA-specific changes (NVIDIA#565)
- Fix registration with Numba, vendor MakeFunctionToJITFunction tests (NVIDIA#566)
- [Refactor][NFC][Cleanups] Update imports to upstream numba to use the numba.cuda modules (NVIDIA#561)
- test: refactor process-based tests to use concurrent futures in order to simplify tests (NVIDIA#550)
- test: revert back to ipc futures that await each iteration (NVIDIA#564)
- chore(deps): move to self-contained pixi.toml to avoid mixed-pypi-pixi environments (NVIDIA#551)
- [Refactor][NFC] Vendor-in errors for future CUDA-specific changes (NVIDIA#534)
- Remove dependencies on target_extension for CUDA target (NVIDIA#555)
- Relax the pinning to `cuda-core` to allow it floating across minor releases (NVIDIA#559)
- [WIP] Port numpy reduction tests to CUDA (NVIDIA#523)
- ci: add timeout to avoid blocking the job queue (NVIDIA#556)
- Handle `cuda.core.Stream` in driver operations (NVIDIA#401)
- feat: add support for `math.exp2` (NVIDIA#541)
- Vendor in types and datamodel for CUDA-specific changes (NVIDIA#533)
- refactor: cleanup device constructor (NVIDIA#548)
- bench: add cupy to array constructor kernel launch benchmarks (NVIDIA#547)
- perf: cache dimension computations (NVIDIA#542)
- perf: remove duplicated size computation (NVIDIA#537)
- chore(perf): add torch to benchmark (NVIDIA#539)
- test: speed up ipc tests by ~6.5x (NVIDIA#527)
- perf: speed up kernel launch (NVIDIA#510)
- perf: remove context threading in various pointer abstractions (NVIDIA#536)
- perf: reduce the number of `__cuda_array_interface__` accesses (NVIDIA#538)
- refactor: remove unnecessary custom map and set implementations (NVIDIA#530)
- [Refactor][NFC] Vendor-in vectorize decorators for future CUDA-specific changes (NVIDIA#513)
- test: add benchmarks for kernel launch for reproducibility (NVIDIA#528)
- test(pixi): update pixi testing command to work with the new `testing` directory (NVIDIA#522)
- refactor: fully remove `USE_NV_BINDING` (NVIDIA#525)
- Draft: Vendor in the IR module (NVIDIA#439)
- pyproject.toml: add search path for Pyrefly (NVIDIA#524)
- Vendor in numba.core.typing for CUDA-specific changes (NVIDIA#473)
- Use numba.config when available, otherwise use numba.cuda.config (NVIDIA#497)
- [MNT] Drop NUMBA_CUDA_USE_NVIDIA_BINDING; always use cuda.core and cuda.bindings as fallback (NVIDIA#479)
- Vendor in dispatcher, entrypoints, pretty_annotate for CUDA-specific changes (NVIDIA#502)
- build: allow parallelization of nvcc testing builds (NVIDIA#521)
- chore(dev-deps): add pixi (NVIDIA#505)
- Vendor the imputils module for CUDA refactoring (NVIDIA#448)
- Don't use `MemoryLeakMixin` for tests that don't use NRT (NVIDIA#519)
- Switch back to stable cuDF release in thirdparty tests (NVIDIA#518)
- Updating .gitignore with binaries in the `testing` folder (NVIDIA#516)
- Remove some unnecessary uses of ContextResettingTestCase (NVIDIA#507)
- Vendor in _helperlib cext for CUDA-specific changes (NVIDIA#512)
- Vendor in typeconv for future CUDA-specific changes (NVIDIA#499)
- [Refactor][NFC] Vendor-in numba.cpython modules for future CUDA-specific changes (NVIDIA#493)
- [Refactor][NFC] Vendor-in numba.np modules for future CUDA-specific changes (NVIDIA#494)
- Make the CUDA target the default for CUDA overload decorators (NVIDIA#511)
- Remove C extension loading hacks (NVIDIA#506)
- Ensure NUMBA can manipulate memory from CUDA graphs before the graph is launched (NVIDIA#437)
- [Refactor][NFC] Vendor-in core Numba analysis utils for CUDA-specific changes (NVIDIA#433)
- Fix Bf16 Test OB Error (NVIDIA#509)
- Vendor in components from numba.core.runtime for CUDA-specific changes (NVIDIA#498)
- [Refactor] Vendor in _dispatcher, _devicearray, mviewbuf C extension for CUDA-specific customization (NVIDIA#373)
- [MNT] Managed UM memset fallback and skip CUDA IPC tests on WSL2 (NVIDIA#488)
- Improve debug value range coverage (NVIDIA#461)
- Add `compile_all` API (NVIDIA#484)
- Vendor in core.registry for CUDA-specific changes (NVIDIA#485)
- [Refactor][NFC] Vendor in numba.misc for CUDA-specific changes (NVIDIA#457)
- Vendor in optional, boxing for CUDA-specific changes, fix dangling imports (NVIDIA#476)
- [test] Remove dependency on cpu_target (NVIDIA#490)
- Change dangling imports of numba.core.lowering to numba.cuda.lowering (NVIDIA#475)
- [test] Use numpy's tolerance for float16 (NVIDIA#491)
- [Refactor][NFC] Vendor-in numba.extending for future CUDA-specific changes (NVIDIA#466)
- [Refactor][NFC] Vendor-in more cpython registries for future CUDA-specific changes (NVIDIA#478)
@gmarkall gmarkall mentioned this pull request Nov 20, 2025
Merged
gmarkall added a commit that referenced this pull request Nov 20, 2025
@gmarkall
Bump version to 0.21.0 (#602)
d08e8a9 
- Add support for cache-hinted load and store operations (#587)
- Add more thirdparty tests (#586)
- Add sphinx-lint to pre-commit and fix errors (#597)
- Add DWARF variant part support for polymorphic variables in CUDA debug
info (#544)
- chore: clean up dead workaround for unavailable `lru_cache` (#598)
- chore(docs): format types docs (#596)
- refactor: decouple `Context` from `Stream` and `Event` objects (#579)
- Fix freezing in of constant arrays with negative strides (#589)
- Update tests to accept variants of generated PTX (#585)
- refactor: replace device functionality with `cuda.core` APIs (#581)
- Move frontend tests to `cudapy` namespace (#558)
- Generalize the concurrency group for main merges (#582)
- ci: move pre-commit checks to pre commit action (#577)
- chore(pixi): set up doc builds; remove most `build-conda` dependencies
(#574)
- ci: ensure that python version in ci matches matrix (#575)
- Fix the `cuda.is_supported_version()` API (#571)
- Fix checks on main (#576)
- feat: add `math.nextafter` (#543)
- ci: replace conda testing with pixi (#554)
- [CI] Run PR workflow on merge to main (#572)
- Propose Alternative Module Path for `ext_types` and Maintain
`numba.cuda.types.bfloat16` Import API (#569)
- test: enable fail-on-warn and clean up resulting failures (#529)
- [Refactor][NFC] Vendor-in compiler_lock for future CUDA-specific
changes (#565)
- Fix registration with Numba, vendor MakeFunctionToJITFunction tests
(#566)
- [Refactor][NFC][Cleanups] Update imports to upstream numba to use the
numba.cuda modules (#561)
- test: refactor process-based tests to use concurrent futures in order
to simplify tests (#550)
- test: revert back to ipc futures that await each iteration (#564)
- chore(deps): move to self-contained pixi.toml to avoid mixed-pypi-pixi
environments (#551)
- [Refactor][NFC] Vendor-in errors for future CUDA-specific changes
(#534)
- Remove dependencies on target_extension for CUDA target (#555)
- Relax the pinning to `cuda-core` to allow it floating across minor
releases (#559)
- [WIP] Port numpy reduction tests to CUDA (#523)
- ci: add timeout to avoid blocking the job queue (#556)
- Handle `cuda.core.Stream` in driver operations (#401)
- feat: add support for `math.exp2` (#541)
- Vendor in types and datamodel for CUDA-specific changes (#533)
- refactor: cleanup device constructor (#548)
- bench: add cupy to array constructor kernel launch benchmarks (#547)
- perf: cache dimension computations (#542)
- perf: remove duplicated size computation (#537)
- chore(perf): add torch to benchmark (#539)
- test: speed up ipc tests by ~6.5x (#527)
- perf: speed up kernel launch (#510)
- perf: remove context threading in various pointer abstractions (#536)
- perf: reduce the number of `__cuda_array_interface__` accesses (#538)
- refactor: remove unnecessary custom map and set implementations (#530)
- [Refactor][NFC] Vendor-in vectorize decorators for future
CUDA-specific changes (#513)
- test: add benchmarks for kernel launch for reproducibility (#528)
- test(pixi): update pixi testing command to work with the new `testing`
directory (#522)
- refactor: fully remove `USE_NV_BINDING` (#525)
- Draft: Vendor in the IR module (#439)
- pyproject.toml: add search path for Pyrefly (#524)
- Vendor in numba.core.typing for CUDA-specific changes (#473)
- Use numba.config when available, otherwise use numba.cuda.config
(#497)
- [MNT] Drop NUMBA_CUDA_USE_NVIDIA_BINDING; always use cuda.core and
cuda.bindings as fallback (#479)
- Vendor in dispatcher, entrypoints, pretty_annotate for CUDA-specific
changes (#502)
- build: allow parallelization of nvcc testing builds (#521)
- chore(dev-deps): add pixi (#505)
- Vendor the imputils module for CUDA refactoring (#448)
- Don't use `MemoryLeakMixin` for tests that don't use NRT (#519)
- Switch back to stable cuDF release in thirdparty tests (#518)
- Updating .gitignore with binaries in the `testing` folder (#516)
- Remove some unnecessary uses of ContextResettingTestCase (#507)
- Vendor in _helperlib cext for CUDA-specific changes (#512)
- Vendor in typeconv for future CUDA-specific changes (#499)
- [Refactor][NFC] Vendor-in numba.cpython modules for future
CUDA-specific changes (#493)
- [Refactor][NFC] Vendor-in numba.np modules for future CUDA-specific
changes (#494)
- Make the CUDA target the default for CUDA overload decorators (#511)
- Remove C extension loading hacks (#506)
- Ensure NUMBA can manipulate memory from CUDA graphs before the graph
is launched (#437)
- [Refactor][NFC] Vendor-in core Numba analysis utils for CUDA-specific
changes (#433)
- Fix Bf16 Test OB Error (#509)
- Vendor in components from numba.core.runtime for CUDA-specific changes
(#498)
- [Refactor] Vendor in _dispatcher, _devicearray, mviewbuf C extension
for CUDA-specific customization (#373)
- [MNT] Managed UM memset fallback and skip CUDA IPC tests on WSL2
(#488)
- Improve debug value range coverage (#461)
- Add `compile_all` API (#484)
- Vendor in core.registry for CUDA-specific changes (#485)
- [Refactor][NFC] Vendor in numba.misc for CUDA-specific changes (#457)
- Vendor in optional, boxing for CUDA-specific changes, fix dangling
imports (#476)
- [test] Remove dependency on cpu_target (#490)
- Change dangling imports of numba.core.lowering to numba.cuda.lowering
(#475)
- [test] Use numpy's tolerance for float16 (#491)
- [Refactor][NFC] Vendor-in numba.extending for future CUDA-specific
changes (#466)
- [Refactor][NFC] Vendor-in more cpython registries for future
CUDA-specific changes (#478)

<!--

Thank you for contributing to numba-cuda :)

Here are some guidelines to help the review process go smoothly.

1. Please write a description in this text box of the changes that are
being
   made.

2. Please ensure that you have written units tests for the changes
made/features
   added.

3. If you are closing an issue please use one of the automatic closing
words as
noted here:
https://help.github.com/articles/closing-issues-using-keywords/

4. If your pull request is not ready for review but you want to make use
of the
continuous integration testing facilities please label it with `[WIP]`.

5. If your pull request is ready to be reviewed without requiring
additional
work on top of it, then remove the `[WIP]` label (if present) and
replace
it with `[REVIEW]`. If assistance is required to complete the
functionality,
for example when the C/C++ code of a feature is complete but Python
bindings
are still required, then add the label `[HELP-REQ]` so that others can
triage
and assist. The additional changes then can be implemented on top of the
same PR. If the assistance is done by members of the rapidsAI team, then
no
additional actions are required by the creator of the original PR for
this,
otherwise the original author of the PR needs to give permission to the
person(s) assisting to commit to their personal fork of the project. If
that
doesn't happen then a new PR based on the code of the original PR can be
opened by the person assisting, which then will be the PR that will be
   merged.

6. Once all work has been done and review has taken place please do not
add
features or make changes out of the scope of those requested by the
reviewer
(doing this just add delays as already reviewed code ends up having to
be
re-reviewed/it is hard to tell what is new etc!). Further, please do not
rebase your branch on main/force push/rewrite history, doing any of
these
   causes the context of any comments made by reviewers to be lost. If
   conflicts occur against main they should be resolved by merging main
   into the branch used for making the pull request.

Many thanks in advance for your cooperation!

-->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kkraus14 kkraus14 kkraus14 approved these changes

Assignees

No one assigned

Labels

4 - Waiting on CI Waiting for a CI run to finish successfully

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@cpcloud @kkraus14 @gmarkall