Skip to content
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

Remove CUDA-Q patch that is no longer needed #48

Merged
merged 3 commits into from
Jan 14, 2025
Merged

Remove CUDA-Q patch that is no longer needed #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b78e5f
Remove no-longer-needed CUDA-Q patch
bmhowe23 Jan 10, 2025
613f9c1
Update pr_workflow.yaml to recognize that a rebuild is needed here
bmhowe23 Jan 10, 2025
b666061
Merge branch 'main' into pr-remove-unneeded-cudaq-patch
bmhowe23 Jan 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/pr_workflow.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ jobs:
build-cudaq:
- '.github/workflows/cudaq_bump.yml'
- '.github/actions/get-cudaq-build/**'
- '.github/workflows/scripts/build_cudaq.sh'
- '.cudaq_version'
build-docs:
- '.github/workflows/docs.yaml'
Expand Down
35 changes: 0 additions & 35 deletions .github/workflows/scripts/build_cudaq.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
# the terms of the Apache License 2.0 which accompanies this distribution. #
# ============================================================================ #


export CUDA_VERSION=12.0

# We need to use a newer toolchain because CUDA-QX libraries rely on c++20
Expand Down Expand Up @@ -65,41 +64,7 @@ index 7b7541d..2261334 100644
endif()
install(TARGETS cudaq-pyscf DESTINATION lib/plugins)'

CUDAQ_PATCH2='diff --git a/lib/Frontend/nvqpp/ConvertDecl.cpp b/lib/Frontend/nvqpp/ConvertDecl.cpp
index 149959c8e..ea23990f6 100644
--- a/lib/Frontend/nvqpp/ConvertDecl.cpp
+++ b/lib/Frontend/nvqpp/ConvertDecl.cpp
@@ -169,8 +169,10 @@ bool QuakeBridgeVisitor::interceptRecordDecl(clang::RecordDecl *x) {
auto fnTy = cast<FunctionType>(popType());
return pushType(cc::IndirectCallableType::get(fnTy));
}
- auto loc = toLocation(x);
- TODO_loc(loc, "unhandled type, " + name + ", in cudaq namespace");
+ if (!isInNamespace(x, "solvers") && !isInNamespace(x, "qec")) {
+ auto loc = toLocation(x);
+ TODO_loc(loc, "unhandled type, " + name + ", in cudaq namespace");
+ }
}
if (isInNamespace(x, "std")) {
if (name.equals("vector")) {
diff --git a/lib/Frontend/nvqpp/ConvertExpr.cpp b/lib/Frontend/nvqpp/ConvertExpr.cpp
index e6350d1c5..28c98c6cb 100644
--- a/lib/Frontend/nvqpp/ConvertExpr.cpp
+++ b/lib/Frontend/nvqpp/ConvertExpr.cpp
@@ -2050,7 +2050,9 @@ bool QuakeBridgeVisitor::VisitCallExpr(clang::CallExpr *x) {
return pushValue(call.getResult(0));
}

- TODO_loc(loc, "unknown function, " + funcName + ", in cudaq namespace");
+ if (!isInNamespace(func, "solvers") && !isInNamespace(func, "qec")) {
+ TODO_loc(loc, "unknown function, " + funcName + ", in cudaq namespace");
+ }
} // end in cudaq namespace

if (isInNamespace(func, "std")) {'

echo "$CUDAQ_PATCH" | git apply --verbose
echo "$CUDAQ_PATCH2" | git apply --verbose

$python -m venv --system-site-packages .venv
source .venv/bin/activate
Expand Down
Loading