Skip to content

Commit

Permalink
Merge pull request #12 from miscco/test_deploy
Browse files Browse the repository at this point in the history
Test deploy
  • Loading branch information
miscco authored May 29, 2024
2 parents 259887a + 4998c98 commit e357d6d
Show file tree
Hide file tree
Showing 364 changed files with 15,291 additions and 17,353 deletions.
44 changes: 14 additions & 30 deletions .github/workflows/build-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,39 +32,23 @@ jobs:

# Build helper image for Thrust/CUB
- name: Build helper image
run: |
bash ./docs/make_env.bash "cccl:docs"
run: bash ./docs/make_env.bash "cccl:docs"

# Build top level docs for CCCL
- name: Build landing page
uses: actions/jekyll-build-pages@v1
with:
source: ./docs/jekyll
destination: ./_site
# Build all docs
- name: Build all docs
run: ./docs/gen_docs.bash

# CUB
- name: Build CUB docs
# Copy all docs to the right folder
- name: Move docs to right oflder
run: |
bash ./docs/build_docs.bash "cccl:docs" /cccl/cub/docs/gen_docs.bash
sudo mkdir -p ./_site/cub
sudo cp -rf ./cub/docs/_build/docs/CUB/latest/* ./_site/cub
# Libcudacxx
- name: Build libcudacxx docs
uses: actions/jekyll-build-pages@v1
with:
source: ./libcudacxx/docs
destination: ./_site/libcudacxx

# Thrust
- name: Build Thrust markdown in Docker
run: bash ./docs/build_docs.bash "cccl:docs" /cccl/thrust/docs/build_docs_locally.bash

- name: Build Thrust docs
uses: actions/jekyll-build-pages@v1
with:
source: ./thrust/build_docs/github_pages
destination: ./_site/thrust
mkdir ./site
cp -rf ./docs/_build/docs/cccl/latest/* .site
mkdir ./site/cub
cp -rf ./docs/_build/docs/cub/latest/* .site
mkdir ./site/libcudacxx
cp -rf ./docs/_build/docs/libcudacxx/latest/* .site
mkdir ./site/thrust
cp -rf ./docs/_build/docs/thrust/latest/* .site
# Upload build artifacts
- name: Upload artifact
Expand Down
20 changes: 14 additions & 6 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ Thank you for your interest in contributing to the CUDA C++ Core Libraries (CCCL
## Making Changes

1. **Create a New Branch**:

```bash
git checkout -b your-feature-branch
```
Expand All @@ -30,6 +31,7 @@ Thank you for your interest in contributing to the CUDA C++ Core Libraries (CCCL
./ci/build_[thrust|cub|libcudacxx].sh -cxx <HOST_COMPILER> -std <CXX_STANDARD> -arch <GPU_ARCHS>
./ci/test_[thrust|cub|libcudacxx].sh -cxx <HOST_COMPILER> -std <CXX_STANDARD> -arch <GPU_ARCHS>
```

For more details on building and testing, refer to the [Building and Testing](#building-and-testing) section below.

4. **Commit Changes**:
Expand All @@ -43,15 +45,18 @@ Thank you for your interest in contributing to the CUDA C++ Core Libraries (CCCL
For more information about design and development practices for each CCCL component, refer to the following developer guides:

#### CUB
- [CUB Developer Guide](cub/docs/developer_overview.rst) - General overview of the design of CUB internals
- [CUB Test Overview](cub/docs/test_overview.rst) - Overview of how to write CUB unit tests
- [CUB Tuning Infrastructure](cub/docs/tuning.rst) - Overview of CUB's performance tuning infrastructure
- [CUB Benchmarks](cub/docs/benchmarking.rst) - Overview of CUB's performance benchmarks

- [CUB Developer Guide](docs/cub/developer_overview.rst) - General overview of the design of CUB internals
- [CUB Test Overview](docs/cub/test_overview.rst) - Overview of how to write CUB unit tests
- [CUB Tuning Infrastructure](docs/cub/tuning.rst) - Overview of CUB's performance tuning infrastructure
- [CUB Benchmarks](docs/cub/benchmarking.rst) - Overview of CUB's performance benchmarks

#### Thrust

Coming soon!

#### libcudacxx

Coming soon!

## Building and Testing
Expand All @@ -61,6 +66,7 @@ CCCL components are header-only libraries. This means there isn't a traditional
There are multiple options for building and running our tests. Which option you choose depends on your preferences and whether you are using [CCCL's DevContainers](.devcontainer/README.md) (highly recommended!).

### Using Manual Build Scripts

#### Building

Use the build scripts provided in the `ci/` directory to build tests for each component. Building tests does not require a GPU.
Expand Down Expand Up @@ -89,6 +95,7 @@ Use the test scripts provided in the `ci/` directory to run tests for each compo
```

**Example:**

```bash
./ci/test_cub.sh -cxx g++ -std 14 -arch "70;75;80-virtual"
```
Expand Down Expand Up @@ -139,7 +146,7 @@ As a common example, the presets are currently always `60;70;80` for `CMAKE_CUDA
cmake --preset=thrust-cpp20 "-DCMAKE_CUDA_ARCHITECTURES=89"
```
> __Note__: Either using the `cmake` command from within the root directory or from within the build directory works, but will behave in slightly different ways. Building and running tests from the build directory will compile every target and run all of the tests configured in the configure step. Doing so from the root directory using the `--preset=<test_preset>` option will build and run a subset of configured targets and tests.
> **Note**: Either using the `cmake` command from within the root directory or from within the build directory works, but will behave in slightly different ways. Building and running tests from the build directory will compile every target and run all of the tests configured in the configure step. Doing so from the root directory using the `--preset=<test_preset>` option will build and run a subset of configured targets and tests.
#### Using CMake Presets via VS Code GUI extension (Recommended when using DevContainers)
Expand Down Expand Up @@ -233,9 +240,10 @@ Once submitted, maintainers will be automatically assigned to review the pull re
For constructive feedback and effective communication during reviews, we recommend following [Conventional Comments](https://conventionalcomments.org/).
Further recommended reading for successful PR reviews:
- [How to Do Code Reviews Like a Human (Part One)](https://mtlynch.io/human-code-reviews-1/)
- [How to Do Code Reviews Like a Human (Part Two)](https://mtlynch.io/human-code-reviews-2/)
## Thank You!
## Thank You
Your contributions enhance CCCL for the entire community. We appreciate your effort and collaboration!
16 changes: 8 additions & 8 deletions cub/cub/block/block_adjacent_difference.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -1052,7 +1052,7 @@ public:
#endif // DOXYGEN_SHOULD_SKIP_THIS

/**
* @deprecated [Since 1.14.0] The cub::BlockAdjacentDifference::FlagHeads
* deprecated [Since 1.14.0] The cub::BlockAdjacentDifference::FlagHeads
* APIs are deprecated. Use cub::BlockAdjacentDifference::SubtractLeft instead.
*
* @param[out] output
Expand All @@ -1073,7 +1073,7 @@ public:
}

/**
* @deprecated [Since 1.14.0] The cub::BlockAdjacentDifference::FlagHeads
* deprecated [Since 1.14.0] The cub::BlockAdjacentDifference::FlagHeads
* APIs are deprecated. Use cub::BlockAdjacentDifference::SubtractLeft instead.
*
* @param[out] output
Expand All @@ -1098,7 +1098,7 @@ public:
}

/**
* @deprecated [Since 1.14.0] The cub::BlockAdjacentDifference::FlagTails
* deprecated [Since 1.14.0] The cub::BlockAdjacentDifference::FlagTails
* APIs are deprecated. Use cub::BlockAdjacentDifference::SubtractRight instead.
*
* @param output
Expand Down Expand Up @@ -1133,7 +1133,7 @@ public:
}

/**
* @deprecated [Since 1.14.0] The cub::BlockAdjacentDifference::FlagTails
* deprecated [Since 1.14.0] The cub::BlockAdjacentDifference::FlagTails
* APIs are deprecated. Use cub::BlockAdjacentDifference::SubtractRight instead.
*
* @param[out] output
Expand Down Expand Up @@ -1171,7 +1171,7 @@ public:
}

/**
* @deprecated [Since 1.14.0] The cub::BlockAdjacentDifference::FlagHeadsAndTails
* deprecated [Since 1.14.0] The cub::BlockAdjacentDifference::FlagHeadsAndTails
* APIs are deprecated. Use cub::BlockAdjacentDifference::SubtractLeft or
* cub::BlockAdjacentDifference::SubtractRight instead.
*
Expand Down Expand Up @@ -1230,7 +1230,7 @@ public:
}

/**
* @deprecated [Since 1.14.0] The cub::BlockAdjacentDifference::FlagHeadsAndTails
* deprecated [Since 1.14.0] The cub::BlockAdjacentDifference::FlagHeadsAndTails
* APIs are deprecated. Use cub::BlockAdjacentDifference::SubtractLeft or
* cub::BlockAdjacentDifference::SubtractRight instead.
*
Expand Down Expand Up @@ -1293,7 +1293,7 @@ public:
}

/**
* @deprecated [Since 1.14.0] The cub::BlockAdjacentDifference::FlagHeadsAndTails
* deprecated [Since 1.14.0] The cub::BlockAdjacentDifference::FlagHeadsAndTails
* APIs are deprecated. Use cub::BlockAdjacentDifference::SubtractLeft or
* cub::BlockAdjacentDifference::SubtractRight instead.
*
Expand Down Expand Up @@ -1352,7 +1352,7 @@ public:
}

/**
* @deprecated [Since 1.14.0] The cub::BlockAdjacentDifference::FlagHeadsAndTails
* deprecated [Since 1.14.0] The cub::BlockAdjacentDifference::FlagHeadsAndTails
* APIs are deprecated. Use cub::BlockAdjacentDifference::SubtractLeft or
* cub::BlockAdjacentDifference::SubtractRight instead.
*
Expand Down
Loading

0 comments on commit e357d6d

Please sign in to comment.