-
Notifications
You must be signed in to change notification settings - Fork 64
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.
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
Revert nvcomp #2483
Merged
Merged
Revert nvcomp #2483
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
6528393
Revert "Update JNI build to support nvcomp4 (#2217)"
gerashegalov 0c49214
Version
gerashegalov a4fd224
Apply and remove patches to CUDF as part of the build
revans2 77f7446
Merge branch 'branch-24.10' into revert_nvcomp_fully
revans2 d875207
Better checking if git is dirty
revans2 e848145
Merge branch 'branch-24.10' into revert_nvcomp_fully
revans2 0ee3f79
Some review comments
revans2 dec9ca7
Get submodule sync to work
revans2 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
#!/bin/bash | ||
|
||
# | ||
# Copyright (c) 2024, NVIDIA CORPORATION. All rights reserved. | ||
# | ||
# 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. | ||
# | ||
|
||
# Run a command in a Docker container with devtoolset | ||
|
||
set -e | ||
|
||
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) | ||
|
||
PATCH_DIR=${PATCH_DIR:-$(realpath "$SCRIPT_DIR/../patches/")} | ||
|
||
CUDF_DIR=${CUDF_DIR:-$(realpath "$SCRIPT_DIR/../thirdparty/cudf/")} | ||
|
||
pushd "$CUDF_DIR" | ||
gerashegalov marked this conversation as resolved.
Show resolved
Hide resolved
|
||
if [ -n "$(git status --porcelain --untracked-files=no)" ] ; then | ||
echo "Error: CUDF repository has uncommitted changes. No patches will be applied..." | ||
exit 1 | ||
fi | ||
|
||
find "$PATCH_DIR" -maxdepth 1 -type f -print0 | sort -zV | while IFS= read -r -d '' file; do | ||
echo "patching with: $file" | ||
patch --no-backup-if-mismatch -f -t --reject-file=- -p1 -i "$file" | ||
done | ||
popd |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
#!/bin/bash | ||
|
||
# | ||
# Copyright (c) 2024, NVIDIA CORPORATION. All rights reserved. | ||
# | ||
# 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. | ||
# | ||
|
||
# Run a command in a Docker container with devtoolset | ||
|
||
set -e | ||
|
||
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nit: the BASE_DIR changes from the apply script apply here as well |
||
|
||
PATCH_DIR=${PATCH_DIR:-$(realpath "$SCRIPT_DIR/../patches/")} | ||
|
||
CUDF_DIR=${CUDF_DIR:-$(realpath "$SCRIPT_DIR/../thirdparty/cudf/")} | ||
|
||
|
||
pushd "$CUDF_DIR" | ||
if [ -n "$(git status --porcelain --untracked-files=no)" ] ; then | ||
#only try to remove patches if it looks like something was changed | ||
find "$PATCH_DIR" -maxdepth 1 -type f -print0 | sort -zV -r | while IFS= read -r -d '' file; do | ||
echo "patching with: $file" | ||
patch -R --no-backup-if-mismatch --reject-file=- -f -t -p1 -i "$file" | ||
done | ||
fi | ||
|
||
# Check for modifications | ||
if [ -n "$(git status --porcelain --untracked-files=no)" ] ; then | ||
echo "Error: CUDF repository has uncommitted changes. You might want to clean in manually if you know that is expected" | ||
exit 1 | ||
fi | ||
popd |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: since we use git later we can use
git rev-parse --show-toplevel
to get the local repo dir,. and build paths from that instead of using ..realpath "$SCRIPT_DIR/.."
later