Skip to content

Add an example Python script that shows how to generate I/O size histogram from nsys report #535

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
Draft
wants to merge 136 commits into
base: branch-25.02
Choose a base branch
from
Draft

Add an example Python script that shows how to generate I/O size histogram from nsys report #535

wants to merge 136 commits into from

Conversation

kingcrimsontianyu
Copy link
Contributor

No description provided.

@kingcrimsontianyu kingcrimsontianyu added improvement Improves an existing functionality non-breaking Introduces a non-breaking change labels Nov 5, 2024
@kingcrimsontianyu kingcrimsontianyu self-assigned this Nov 5, 2024
@copy-pr-bot copy-pr-bot
Copy link

copy-pr-bot bot commented Dec 12, 2024

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.

@kingcrimsontianyu kingcrimsontianyu changed the base branch from branch-24.12 to branch-25.02 December 12, 2024 13:55
raydouglass and others added 22 commits January 23, 2025 15:03
@raydouglass
DOC v25.04 Updates [skip ci]
2d5fb60
@kingcrimsontianyu
Apply east const using clang-format. Fix header issues reported by cl…
ff6f841 
…ang-tidy (rapidsai#594)

This small PR applies east const style using `clang-format`. This makes KvikIO consistent with cuDF in coding style. The following parameters were applied to `.clang-format` for auto-reformatting. The file `.clang-format` itself is not updated in this PR.
```
QualifierAlignment: Custom
QualifierOrder: [inline, static, type, const, volatile]
```
In addition, this PR fixes minor "missing header" issues reported by `clang-tidy`.

Authors:
  - Tianyu Liu (https://github.com/kingcrimsontianyu)

Approvers:
  - Vukasin Milovanovic (https://github.com/vuule)
  - Mads R. B. Kristensen (https://github.com/madsbk)

URL: rapidsai#594
@bdice
Merge branch-25.02 into branch-25.04
b7be217
@AyodeAwe
Merge pull request rapidsai#610 from bdice/branch-25.04-merge-25.02
0940856 
Forward-merge branch-25.02 to branch-25.04
@bdice
Migrate to NVKS for amd64 CI runners (rapidsai#605)
6b0836e 
This migrates amd64 CI jobs (PRs and nightlies) to use L4 GPUs from the NVKS cluster.

xref: rapidsai/build-infra#184

Authors:
  - Bradley Dice (https://github.com/bdice)

Approvers:
  - Gil Forsyth (https://github.com/gforsyth)

URL: rapidsai#605
@jameslamb
disallow fallback to Make in Python builds (rapidsai#612)
3630b8c 
Contributes to rapidsai/build-planning#146

Proposes:

* setting `[tool.scikit-build].ninja.make-fallback = false`, so `scikit-build-core` will not silently fallback to using GNU Make if `ninja` is not available

Authors:
  - James Lamb (https://github.com/jameslamb)

Approvers:
  - Bradley Dice (https://github.com/bdice)

URL: rapidsai#612
@kingcrimsontianyu
Add RAII file wrappers to avoid resource leak (rapidsai#614)
255ed48 
Closes rapidsai#607

Authors:
  - Tianyu Liu (https://github.com/kingcrimsontianyu)

Approvers:
  - Kyle Edwards (https://github.com/KyleFromNVIDIA)
  - Mads R. B. Kristensen (https://github.com/madsbk)
  - Vukasin Milovanovic (https://github.com/vuule)

URL: rapidsai#614
@vyasr
Fix package versioning (rapidsai#616)
b001413 
The nightly package versions are currently not being correctly assigned.

Authors:
  - Vyas Ramasubramani (https://github.com/vyasr)

Approvers:
  - Mads R. B. Kristensen (https://github.com/madsbk)
  - James Lamb (https://github.com/jameslamb)

URL: rapidsai#616
@gforsyth
Add shellcheck to pre-commit and fix warnings (rapidsai#621)
099657c 
`shellcheck` is a fast, static analysis tool for shell scripts. It's good at
flagging up unused variables, unintentional glob expansions, and other potential
execution and security headaches that arise from the wonders of `bash` (and
other shlangs).

This PR adds a `pre-commit` hook to run `shellcheck` on all of the `sh-lang`
files in the `ci/` directory, and the changes requested by `shellcheck` to make
the existing files pass the check.

xref: rapidsai/build-planning#135

Authors:
  - Gil Forsyth (https://github.com/gforsyth)

Approvers:
  - James Lamb (https://github.com/jameslamb)
  - Mads R. B. Kristensen (https://github.com/madsbk)

URL: rapidsai#621
@gforsyth
Add build_type input field for test.yaml (rapidsai#620)
6b1a71f 
Exposes `build_type` as an input in `test.yaml` so that `test.yaml` can be
manually run against a specific branch/commit as needed.

The default value is still `nightly`, and without maintainer intervention, that
is what will run each night.

xref rapidsai/build-planning#147

Authors:
  - Gil Forsyth (https://github.com/gforsyth)

Approvers:
  - James Lamb (https://github.com/jameslamb)

URL: rapidsai#620
@bdice
Use shared-workflows branch-25.04 (rapidsai#623)
5b57e49 
This completes the migration to NVKS runners now that all libraries have been tested and rapidsai/shared-workflows#273 has been merged.

xref: rapidsai/build-infra#184

Authors:
  - Bradley Dice (https://github.com/bdice)

Approvers:
  - James Lamb (https://github.com/jameslamb)

URL: rapidsai#623
@bdice
Merge branch-25.02 into branch-25.04
31f4af8
@msarahan
add telemetry (rapidsai#615)
7dcf216 
Enables telemetry during kvikio CI runs. This is done by parsing GitHub Actions run log metadata and should have no impact on build or test times.

xref rapidsai/build-infra#139

Authors:
  - Mike Sarahan (https://github.com/msarahan)
  - James Lamb (https://github.com/jameslamb)

Approvers:
  - James Lamb (https://github.com/jameslamb)

URL: rapidsai#615
@bdice
Use rapids-generate-version for package versions (rapidsai#628)
5a825df 
This uses the `RAPIDS_PACKAGE_VERSION` values set in rapidsai#616. This ensures we have consistent nightly versions.

This PR is independent of rapidsai#622 (it is needed regardless of whether that PR is closed or merged).

Authors:
  - Bradley Dice (https://github.com/bdice)

Approvers:
  - James Lamb (https://github.com/jameslamb)

URL: rapidsai#628
@raydouglass
Merge pull request rapidsai#626 from bdice/branch-25.04-merge-25.02
c38038e 
Forward-merge branch-25.02 into branch-25.04
@GPUtester
Merge pull request rapidsai#633 from rapidsai/branch-25.02
f171d74 
Forward-merge branch-25.02 into branch-25.04
@KyleFromNVIDIA
Consolidate more Conda solves in CI (rapidsai#636)
ecb81c2 
Issue: rapidsai/build-planning#22

Authors:
  - Kyle Edwards (https://github.com/KyleFromNVIDIA)

Approvers:
  - James Lamb (https://github.com/jameslamb)

URL: rapidsai#636
@kingcrimsontianyu
Adjust the way of determining FileHandle's compatibility mode for syn…
887679b 
…c and async I/O to improve code readability (rapidsai#608)

This PR improves the readability of compatibility mode handling.

The current way of determining FileHandle's compatibility mode is somewhat complicated and unintuitive. The data member `_compat_mode` accompanied by some utility functions more or less combines 3 different things into one:

- The initially requested compat mode (`ON`/`OFF`/`AUTO`)
- The capability of performing synchronous cuFile I/O (bool)
- The capability of performing asynchronous cufile I/O (bool)

The disadvantages include:
- `FileHandle::is_compat_mode_preferred()` always derives the preferred compat mode on the fly as opposed to getting an already determined value.
- `FileHandle::is_compat_mode_preferred_for_async(CompatMode)` is potentially throwing, which is asymmetric to `is_compat_mode_preferred()`. Also when the compat mode is `OFF`, it has to invoke `is_stream_api_available()` and `config_path()` on each pass instead of getting an already determined value.
- There is no way to retrieve what the original requested compat mode is.

These add to cognitive burden when rereading the source to introduce new features to FileHandle. This PR attempts to improve the logic by making it concise and crystal clear.

This PR also fixes a line number bug in error handling.

This PR is breaking in that the rarely used public functions to query the compat mode data in the `FileHandle` are removed. These data are instead queryable via the new `CompatModeManager` class.

Authors:
  - Tianyu Liu (https://github.com/kingcrimsontianyu)

Approvers:
  - Mads R. B. Kristensen (https://github.com/madsbk)
  - Lawrence Mitchell (https://github.com/wence-)

URL: rapidsai#608
@kingcrimsontianyu
Enable tracing of thread pool tasks using NVTX (rapidsai#630)
096ac0f 
This PR implements the basic feature outlined in rapidsai#631. 
The two good-to-haves are currently blocked.

Authors:
  - Tianyu Liu (https://github.com/kingcrimsontianyu)

Approvers:
  - Mads R. B. Kristensen (https://github.com/madsbk)
  - Lawrence Mitchell (https://github.com/wence-)

URL: rapidsai#630
@yiheng-wang-nv
Add tutorials to showcase GDS for nifti and dicom images (rapidsai#597)
77da587 
This PR addresses the tutorial contribution mentioned in rapidsai#580

Authors:
  - Yiheng Wang (https://github.com/yiheng-wang-nv)
  - Mads R. B. Kristensen (https://github.com/madsbk)

Approvers:
  - Mads R. B. Kristensen (https://github.com/madsbk)

URL: rapidsai#597
@GPUtester
Merge pull request rapidsai#640 from rapidsai/branch-25.02
974a9d8 
Forward-merge branch-25.02 into branch-25.04
@KyleFromNVIDIA
Add verify-codeowners hook (rapidsai#611)
a9bc84c 
Issue: rapidsai/pre-commit-hooks#61

Authors:
  - Kyle Edwards (https://github.com/KyleFromNVIDIA)

Approvers:
  - Mads R. B. Kristensen (https://github.com/madsbk)
  - James Lamb (https://github.com/jameslamb)

URL: rapidsai#611
vyasr and others added 30 commits June 13, 2025 16:49
@vyasr
Use variants to produce separate builds with and without cufile suppo…
c3509ac 
…rt (rapidsai#754)

On arm cufile was not supported until CUDA 12.2, whereas support exists since 12.0 on x86 architectures. To properly reflect these dependencies, we need to build separate variants of cufile on arm for cuda versions before and after 12.2. This PR updates the recipe to support that.

Authors:
  - Vyas Ramasubramani (https://github.com/vyasr)

Approvers:
  - Gil Forsyth (https://github.com/gforsyth)
  - Bradley Dice (https://github.com/bdice)

URL: rapidsai#754
@kingcrimsontianyu
Fix unit test UB resulting from incorrect initialization (rapidsai#751)
03351cf 
KvikIO unit test has a utility class `EnvVarContext` class, introduced in rapidsai#700, and slightly improved in rapidsai#735. It has been identified that this class was incorrectly initialized, resulting in UB: it causes the unit test failure in C++20, which by fluke was not observed in C++17. This PR fixes this error. Specifically, the constructor of `EnvVarContext` is:
```
EnvVarContext(std::initializer_list<std::pair<std::string_view, std::string_view>> env_var_entries);
```
There are several ways of instantiation:
```
// Direct initialization
EnvVarContext env_var_ctx({{"env_1", "v1"}, {"env_2", "v2"}});

// Direct list initialization
EnvVarContext env_var_ctx{{"env_1", "v1"}, {"env_2", "v2"}};

// Copy list initialization
EnvVarContext env_var_ctx = {{"env_1", "v1"}, {"env_2", "v2"}};
```
The erroneous instantiation performed is:
```
// Extra pair of braces
// {}: brace-enclosed initializer list
// {{"env_1", "v1"}, {"env_2", "v2"}}: one element of type pair<std::string_view, std::string_view>
// {"env_1", "v1"}: first
// {"env_2", "v2"}: second
EnvVarContext env_var_ctx{{{"env_1", "v1"}, {"env_2", "v2"}}};
``` 
As a result, the initializer list only has 1 pair, with the key being `{"env_1", "v1"}` and value being `{"env_2", "v2"}`. For the key, for instance, the 5-th overload (https://en.cppreference.com/w/cpp/string/basic_string_view/basic_string_view.html) of the constructor was used, where `first` points to "env_1" and `last` points to "v1". Since the two iterators do not form a valid range, UB ensues.

Authors:
  - Tianyu Liu (https://github.com/kingcrimsontianyu)

Approvers:
  - Mads R. B. Kristensen (https://github.com/madsbk)

URL: rapidsai#751
@kingcrimsontianyu
Add the utility function to clear page cache (rapidsai#741)
b87d111 
This PR introduces a utility function to clear page cache in C++ and Python.

Authors:
  - Tianyu Liu (https://github.com/kingcrimsontianyu)
  - Mads R. B. Kristensen (https://github.com/madsbk)

Approvers:
  - Vukasin Milovanovic (https://github.com/vuule)
  - Mads R. B. Kristensen (https://github.com/madsbk)

URL: rapidsai#741
@jakirkham
Set compiler versions in context (rapidsai#755)
5918cf3 
Simplify the logic necessary to handle compiler versions by folding it into the context.

Authors:
  - https://github.com/jakirkham

Approvers:
  - Vyas Ramasubramani (https://github.com/vyasr)

URL: rapidsai#755
@vyasr
Use RAPIDS' CUDA major-minor version in Conda's cuda_version (rapid…
007c067 
…sai#758)

We need to drop the CUDA patch version from `cuda_version`.

Authors:
  - Vyas Ramasubramani (https://github.com/vyasr)

Approvers:
  - Bradley Dice (https://github.com/bdice)

URL: rapidsai#758
@vyasr
Remove nvidia and dask channels (rapidsai#759)
9ec0f95 
Now that we have dropped support for CUDA 11 we no longer require the nvidia channel.
With the changes in rapidsai/rapids-dask-dependency#85, RAPIDS now only uses released versions of dask, so we no longer need the dask channel either.
This PR also removes the explicit cufile dependence in the kvikio conda packages, which should no longer be necessary now that we have variants of the libkvikio package for different CUDA versions handling this dependency (see rapidsai#754).

Contributes to rapidsai/build-planning#184

Authors:
  - Vyas Ramasubramani (https://github.com/vyasr)

Approvers:
  - James Lamb (https://github.com/jameslamb)

URL: rapidsai#759
@gforsyth
refactor(shellcheck): enable for all files and fix remaining warnings (…
3d59ec9 
…rapidsai#760)

xref rapidsai/build-planning#135

Authors:
  - Gil Forsyth (https://github.com/gforsyth)

Approvers:
  - James Lamb (https://github.com/jameslamb)
  - Lawrence Mitchell (https://github.com/wence-)

URL: rapidsai#760
@jakirkham
Use CUDA 12.9 in Conda, Devcontainers, Spark, GHA, etc. (rapidsai#762)
fd4a3bf 
Use CUDA 12.9 throughout different build and test environments.

Authors:
  - https://github.com/jakirkham

Approvers:
  - Jake Awe (https://github.com/AyodeAwe)
  - Vyas Ramasubramani (https://github.com/vyasr)

URL: rapidsai#762
@jameslamb
add docs on CI workflow inputs (rapidsai#764)
e94379a 
Contributes to rapidsai/shared-workflows#376

* adds descriptions for all inputs to workflows triggered by `workflow_dispatch`

## Notes for Reviewers

### Motivation

The input descriptions show up in the UI when you go to trigger these workflows. Like this:

![image](https://github.com/user-attachments/assets/fc62d1ff-39eb-47c7-9a21-57aab959e64f)

I'm hoping that will make it easier for developers to manually trigger workflows. Inspired by being asked multiple times "what format is `date` supposed to be in?".

Authors:
  - James Lamb (https://github.com/jameslamb)

Approvers:
  - Jake Awe (https://github.com/AyodeAwe)

URL: rapidsai#764
@kingcrimsontianyu
Fix a case sensitivity bug in S3 remote I/O (rapidsai#765)
f091ebc 
AWS S3 object key name is case sensitive. Current implementation of `open_s3_url` converts all the letters of URL to lowercase before passing it to the wrapped C++ library. As a result, if the object key name contains any capital letter, the following error will occur:
```
RuntimeError: KvikIO failure at: /home/coder/kvikio/cpp/src/shim/libcurl.cpp:176: curl_easy_perform() error (The requested URL returned error: 404)
```
This PR fixes this issue by forwarding the user-provided URL as-is.

Authors:
  - Tianyu Liu (https://github.com/kingcrimsontianyu)

Approvers:
  - Tom Augspurger (https://github.com/TomAugspurger)
  - Bradley Dice (https://github.com/bdice)

URL: rapidsai#765
@kingcrimsontianyu
Fix remote I/O file size overflow in Python binding (rapidsai#766)
83a25ec 
KvikIO remote I/O interface requires users to provide a buffer to read the remote data into. The following pattern is often used:
```python
import cupy as cp

# Create a remote handle from the URL
remote_handle = kvikio.RemoteFile.open_s3_url(url)

# Query the remote file size and preallocate the user-provided buffer
buf = cp.empty(remote_handle.nbytes(), dtype=cp.int8)

# Read into the buffer
fut = remote_handle.pread(buf)
fut.get()
```
Currently in Cython, the `extern` method `nbytes()` (remote file size) is given a return type of `int`, whereas its initial return type in the C++ library is `std::size_t`. The `int` here is interpreted as the `int` in C++ as opposed to the variable-length `int` in Python. Consequently, integer overflow occurs when reading from a large-size file, in which case `nbytes()` returns negative values.
This PR fixes this bug.

Authors:
  - Tianyu Liu (https://github.com/kingcrimsontianyu)

Approvers:
  - Tom Augspurger (https://github.com/TomAugspurger)
  - Lawrence Mitchell (https://github.com/wence-)

URL: rapidsai#766
@pentschev
Remove CUDA 11 mentions from docs (rapidsai#769)
54c420a 
As part of rapidsai#768, remove CUDA 11 from docs.

Authors:
  - Peter Andreas Entschev (https://github.com/pentschev)
  - Tom Augspurger (https://github.com/TomAugspurger)

Approvers:
  - Bradley Dice (https://github.com/bdice)
  - https://github.com/jakirkham

URL: rapidsai#769
@AyodeAwe
DOC v25.10 Updates [skip ci]
b7ec813
@gforsyth
fix(docker): use versioned -latest tag for all rapidsai images (r…
ef7d256 
…apidsai#771)

In rapidsai/build-planning#187 we switched the docker image tagging scheme
over to include the CalVer information.  This was done to allow us to make
changes to the images during burndown without breaking release pipelines.

This PR moves all of the existing `latest` tags to the newer versioned tag
`25.08-latest` and also modifies the `update_version.sh` script to bump
that version at branch creation time.

xref: rapidsai/build-planning#187

Authors:
  - Gil Forsyth (https://github.com/gforsyth)
  - James Lamb (https://github.com/jameslamb)

Approvers:
  - James Lamb (https://github.com/jameslamb)

URL: rapidsai#771
@GPUtester
Merge pull request rapidsai#772 from rapidsai/branch-25.08
124d85f 
Forward-merge branch-25.08 into branch-25.10
@bdice
Use libnvcomp conda package (rapidsai#774)
33a734c 
The `nvcomp` conda package is being split into a C++ package `libnvcomp` and a Python bindings package `nvcomp`. We want to use the C++ package only, so we are adopting `libnvcomp`.

Authors:
  - Bradley Dice (https://github.com/bdice)

Approvers:
  - Gil Forsyth (https://github.com/gforsyth)

URL: rapidsai#774
@GPUtester
Merge pull request rapidsai#775 from rapidsai/branch-25.08
f85461e 
Forward-merge branch-25.08 into branch-25.10
@pentschev
Remove CUDA 11 workarounds (rapidsai#770)
068e11a 
As part of rapidsai#768, remove CUDA 11 workarounds that should not anymore be necessary given CUDA 11 support is being dropped.

Authors:
  - Peter Andreas Entschev (https://github.com/pentschev)
  - https://github.com/jakirkham

Approvers:
  - Bradley Dice (https://github.com/bdice)
  - Tianyu Liu (https://github.com/kingcrimsontianyu)

URL: rapidsai#770
@GPUtester
Merge pull request rapidsai#777 from rapidsai/branch-25.08
4831fa8 
Forward-merge branch-25.08 into branch-25.10
@kingcrimsontianyu
Support file-backed mapping (1/n): host/device read C++ implementation (
cb76305 
rapidsai#740)

This PR introduces memory-mapped I/O (`MmapHandle`) as an alternative to the standard I/O (`FileHandle`).

The benchmark results are at rapidsai#530 (comment)

Partially addresses rapidsai#530

Authors:
  - Tianyu Liu (https://github.com/kingcrimsontianyu)

Approvers:
  - Mads R. B. Kristensen (https://github.com/madsbk)
  - Vukasin Milovanovic (https://github.com/vuule)

URL: rapidsai#740
@GPUtester
Merge pull request rapidsai#778 from rapidsai/branch-25.08
323dd10 
Forward-merge branch-25.08 into branch-25.10
@bdice
Allow latest OS in devcontainers (rapidsai#780)
fab9f0e 
This PR removes the OS suffix from devcontainers, allowing the upstream devcontainer images to determine the OS version.

Contributes to rapidsai/build-planning#200.

Authors:
  - Bradley Dice (https://github.com/bdice)

Approvers:
  - Gil Forsyth (https://github.com/gforsyth)

URL: rapidsai#780
@kingcrimsontianyu
Merge branch 'branch-25.10' into kvikio-stat
eafa659
@kingcrimsontianyu
Move file
f7af7e0
@kingcrimsontianyu
Relax mmap read requirement. Improve error message. (rapidsai#781)
888fcbf 
cuDF PR rapidsai/cudf#19164 currently has 4 failed unit tests when `LIBCUDF_MMAP_ENABLED=ON`:
```
28 - CSV_TEST (Failed)
29 - ORC_TEST (Failed)
32 - JSON_TEST (Failed)
40 - DATA_CHUNK_SOURCE_TEST (Failed)
```
The fix entails code changes on both the KvikIO and cuDF sides.
On the KvikIO side, the `MmapHandle::read()` and `MmapHandle::pread()` methods need to:
- Allow the read size to be 0
- Allow `offset` to be equal to `initial_map_offset` (when the read size is 0)

This PR makes this change. In addition, this PR adds more detailed error messages when out-of-range exception occurs.

Authors:
  - Tianyu Liu (https://github.com/kingcrimsontianyu)

Approvers:
  - Mads R. B. Kristensen (https://github.com/madsbk)

URL: rapidsai#781
@vyasr
Use GCC 14 in conda builds. (rapidsai#756)
003d671 
conda-forge is migrating to gcc 14, so this PR is updating for alignment.

See rapidsai/build-planning#188

Authors:
  - Vyas Ramasubramani (https://github.com/vyasr)

Approvers:
  - Gil Forsyth (https://github.com/gforsyth)

URL: rapidsai#756
@robertmaynard
Update build infra to support new branching strategy (rapidsai#776)
074758e 
rapids_config will use `RAPIDS_BRANCH` contents to determine what branch to use

Authors:
  - Robert Maynard (https://github.com/robertmaynard)

Approvers:
  - Bradley Dice (https://github.com/bdice)

URL: rapidsai#776
@vyasr
Revert "Set compiler versions in context (rapidsai#755)" (rapidsai#784)
a1bd3ea 
Closes rapidsai#773

Authors:
  - Vyas Ramasubramani (https://github.com/vyasr)

Approvers:
  - Bradley Dice (https://github.com/bdice)

URL: rapidsai#784
@kingcrimsontianyu
Use C++20 standard (rapidsai#749)
7bfaf34 
This PR changes KvikIO C++ standard from 17 to 20.

Depends on rapidsai#751

Authors:
  - Tianyu Liu (https://github.com/kingcrimsontianyu)
  - Vyas Ramasubramani (https://github.com/vyasr)

Approvers:
  - Mads R. B. Kristensen (https://github.com/madsbk)
  - Bradley Dice (https://github.com/bdice)

URL: rapidsai#749
@kingcrimsontianyu
Merge branch 'branch-25.10' into kvikio-stat
16493c5
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@kingcrimsontianyu kingcrimsontianyu

Labels
improvement Improves an existing functionality non-breaking Introduces a non-breaking change
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.