Skip to content

Commit

Permalink
Merge pull request #47 from rapidsai/branch-21.06
Browse files Browse the repository at this point in the history
[RELEASE] cucim v21.06
  • Loading branch information
raydouglass authored Jun 9, 2021
2 parents fc9803f + 76e2f8c commit f98b607
Show file tree
Hide file tree
Showing 140 changed files with 6,431 additions and 906 deletions.
18 changes: 18 additions & 0 deletions 3rdparty/LICENSE.libcuckoo
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
Copyright (C) 2013, Carnegie Mellon University and Intel Corporation

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

---------------------------

The third-party libraries have their own licenses, as detailed in their source
files.
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
# cuCIM 21.06.00 (9 Jun 2021)

## 🐛 Bug Fixes

- Update `update-vesion.sh` ([#42](https://github.com/rapidsai/cucim/pull/42)) [@ajschmidt8](https://github.com/ajschmidt8)

## 🛠️ Impovements

- Update envionment vaiable used to detemine `cuda_vesion` ([#43](https://github.com/rapidsai/cucim/pull/43)) [@ajschmidt8](https://github.com/ajschmidt8)
- Update vesion scipt to emove bump2vesion dependency ([#41](https://github.com/rapidsai/cucim/pull/41)) [@gigony](https://github.com/gigony)
- Update changelog ([#40](https://github.com/rapidsai/cucim/pull/40)) [@ajschmidt8](https://github.com/ajschmidt8)
- Update docs build scipt ([#39](https://github.com/rapidsai/cucim/pull/39)) [@ajschmidt8](https://github.com/ajschmidt8)

# cuCIM 0.19.0 (15 Apr 2021)

Initial release of cuCIM including cuClaraImage and [cupyimg](https://github.com/mritools/cupyimg).
3 changes: 3 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ include(ExternalProject)
################################################################################
option(CUCIM_SUPPORT_GDS "Support cufile library" OFF)
option(CUCIM_STATIC_GDS "Use static cufile library" OFF)
option(CUCIM_SUPPORT_CUDA "Support CUDA" ON)

# Setup CXX11 ABI
# : Adds CXX11 ABI definition to the compiler command line for targets in the current directory,
Expand All @@ -124,6 +125,8 @@ superbuild_depend(openslide)
superbuild_depend(catch2)
superbuild_depend(cli11)
superbuild_depend(json)
superbuild_depend(libcuckoo)
superbuild_depend(boost-header-only)

################################################################################
# Define some names
Expand Down
16 changes: 10 additions & 6 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,18 +58,17 @@ The following instructions are for developers and contributors to cuCIM OSS deve

#### Python

cuCIM uses [Black](https://black.readthedocs.io/en/stable/),
[isort](https://readthedocs.org/projects/isort/), and
cuCIM uses [isort](https://readthedocs.org/projects/isort/), and
[flake8](http://flake8.pycqa.org/en/latest/) to ensure a consistent code format
throughout the project. `Black`, `isort`, and `flake8` can be installed with
throughout the project. `isort`, and `flake8` can be installed with
`conda` or `pip`:

```bash
conda install black isort flake8
conda install isort flake8
```

```bash
pip install black isort flake8
pip install isort flake8
```

These tools are used to auto-format the Python code in the repository. Additionally, there is a CI check in place to enforce
Expand All @@ -78,7 +77,6 @@ automatically format your python code by running:

```bash
isort --atomic python/**/*.py
black python
```

### Get libcucim Dependencies
Expand Down Expand Up @@ -145,3 +143,9 @@ cp -P python/install/lib/* python/cucim/src/cucim/clara/
cd python/cucim/
python -m pip install .
```

For contributors interested in working on the Python code from an in-place
(editable) installation, replace the last line above with
```bash
python -m pip install --editable .
```
Loading

0 comments on commit f98b607

Please sign in to comment.