Skip to content

Eliminate clang-tidy dependency #1591

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

Open
dime10 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Eliminate clang-tidy dependency #1591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 0 additions & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ PyYAML
# formatting/linting
black
clang-format==14.*
clang-tidy~=16.0
pylint
isort

Expand Down
1 change: 0 additions & 1 deletion runtime/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
# Compiler options
option(ENABLE_CODE_COVERAGE "Enable code coverage" OFF)
option(ENABLE_ADDRESS_SANITIZER "Enable address sanitizer" OFF)
option(RUNTIME_CLANG_TIDY "Enable Clang Tidy" OFF)

option(ENABLE_OPENQASM "Build OpenQasm backend device" OFF)
option(ENABLE_OQD "Build OQD backend device" OFF)
Expand Down
14 changes: 1 addition & 13 deletions runtime/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ help:
@echo " test to run the Catalyst runtime test suite"
@echo " format [check=1] to apply C++ formatter; use with 'check=1' to check instead of modify (requires clang-format)"
@echo " format [version=?] to apply C++ formatter; use with 'version={version}' to run clang-format-{version} instead of clang-format"
@echo " check-tidy to build Catalyst Runtime with RUNTIME_CLANG_TIDY=ON (requires clang-tidy)"

.PHONY: configure
configure:
Expand Down Expand Up @@ -115,7 +114,7 @@ endif
.PHONY: clean
clean:
@echo "clean build files"
rm -rf $(RT_BUILD_DIR) $(RT_BUILD_DIR)_cov cov coverage.info $(MK_DIR)/BuildTidy
rm -rf $(RT_BUILD_DIR) $(RT_BUILD_DIR)_cov cov coverage.info

.PHONY: format
format:
Expand All @@ -124,14 +123,3 @@ ifdef check
else
$(PYTHON) ../bin/format.py $(if $(version:-=),--cfversion $(version)) .
endif

.PHONY: check-tidy
check-tidy:
@echo "build Catalyst Runtime with RUNTIME_CLANG_TIDY=ON"
cmake -G Ninja -B $(MK_DIR)/BuildTidy . \
-DCMAKE_BUILD_TYPE=$(BUILD_TYPE) \
-DCMAKE_C_COMPILER=$(C_COMPILER) \
-DCMAKE_CXX_COMPILER=$(CXX_COMPILER) \
-DRUNTIME_CLANG_TIDY=ON

cmake --build $(MK_DIR)/BuildTidy --target rt_capi -j$(NPROC)
11 changes: 0 additions & 11 deletions runtime/lib/backend/openqasm/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,3 @@
if(RUNTIME_CLANG_TIDY)
if(NOT DEFINED CLANG_TIDY_BINARY)
set(CLANG_TIDY_BINARY clang-tidy)
endif()
message(STATUS "Using CLANG_TIDY_BINARY=${CLANG_TIDY_BINARY}")
set(CMAKE_CXX_CLANG_TIDY ${CLANG_TIDY_BINARY};
-extra-arg=-std=c++20;
--use-color;
)
endif()

# nanobind suggests including these lines to configure CMake to perform an optimized release build
# by default unless another build type is specified. Without this addition, binding code may run
# slowly and produce large binaries.
Expand Down
Loading