Skip to content

Allow building static CQiree #42

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
ausbin wants to merge 10 commits into
base: main
Choose a base branch
from
Open

Allow building static CQiree #42

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d4f2483
Allow building static cqiree
ausbin Oct 7, 2025
67cc870
Install CQiree headers
ausbin Oct 7, 2025
2a199d0
Remove a C++ include inside a C header
ausbin Oct 7, 2025
904acb3
Mention that LLVM 21 works
ausbin Oct 7, 2025
5ee758b
Add `#include` to get CQiree tests to build
ausbin Oct 7, 2025
ede775f
Move `#include`s outside `extern "C"`
ausbin Oct 7, 2025
0f64e16
Handle JSON in .clang-format
ausbin Oct 7, 2025
11d854f
Make static build controlled by config option
ausbin Oct 7, 2025
ef6d847
Add static build to build matrix
ausbin Oct 7, 2025
ac67a47
Address PR comments
ausbin Oct 8, 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
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,8 @@ set(QIREE_RUNTIME_OUTPUT_DIRECTORY
enable_language(C) # Needed for LLVM
find_package(LLVM REQUIRED)
if((LLVM_VERSION VERSION_LESS 14)
OR (LLVM_VERSION VERSION_GREATER_EQUAL 21))
message(WARNING "QIR-EE is only tested with LLVM 14-20: found version ${LLVM_VERSION}")
OR (LLVM_VERSION VERSION_GREATER_EQUAL 22))
message(WARNING "QIR-EE is only tested with LLVM 14-21: found version ${LLVM_VERSION}")
endif()

if(QIREE_USE_QSIM)
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ doc` (user) or `make doxygen` (developer).

There are two dependencies for QIR-EE to work properly. Please make sure to
download and install the most current versions of:
1. [LLVM](https://releases.llvm.org/) (we have tested versions 14 through 18)
1. [LLVM](https://releases.llvm.org/) (we have tested versions 14 through 21)
2. [XACC](https://github.com/ORNL-QCI/xacc) (repo that is actively
maintained -- not the eclipse one; currently required for execution in
this version of qir-ee; we recommend setting option `-DQIREE_MINIMAL_BUILD=ON`
Expand Down
8 changes: 4 additions & 4 deletions src/cqiree/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ if(QIREE_USE_QSIM)
list(APPEND _CQIREE_LIBS QIREE::qirqsim)
endif()

qiree_add_library(cqiree MODULE
qiree_add_library(cqiree
Comment thread
sethrj marked this conversation as resolved.
Outdated
CQiree.cc
QireeManager.cc
)
Expand All @@ -28,10 +28,10 @@ target_link_libraries(cqiree
#----------------------------------------------------------------------------#

# C/C++ source headers
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/cqiree"
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/"
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/cqiree"
COMPONENT development
FILES_MATCHING REGEX ".*\\.hh$"
FILES_MATCHING REGEX ".*\\.hh?$"
Comment thread
ausbin marked this conversation as resolved.
Outdated
)

#-----------------------------------------------------------------------------#
1 change: 0 additions & 1 deletion src/cqiree/CQiree.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
//---------------------------------------------------------------------------//
#pragma once

#include <cstdint>
#ifdef __cplusplus
extern "C" {
#endif
Expand Down
1 change: 1 addition & 0 deletions test/cqiree/CQiree.test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
//---------------------------------------------------------------------------//
#include "cqiree/CQiree.h"

#include <algorithm>
#include <array>
#include <cstdint>
#include <fstream>
Expand Down