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

Drop dependency on distutils #651

Merged
merged 14 commits into from
Jan 24, 2024
Merged

Drop dependency on distutils #651

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
31f043f
Drop dependency on distutils
NoureldinYosri Jan 23, 2024
413b807
add to docker
NoureldinYosri Jan 23, 2024
b692d24
add to docker
NoureldinYosri Jan 23, 2024
6888549
add to requirements
NoureldinYosri Jan 23, 2024
6362f9f
move import
NoureldinYosri Jan 23, 2024
cc6c3b8
style
NoureldinYosri Jan 23, 2024
9099e4e
upgrade to 3.12
NoureldinYosri Jan 23, 2024
e909604
nit
NoureldinYosri Jan 24, 2024
d7e3a3c
revert
NoureldinYosri Jan 24, 2024
0ff175b
upgrade to 3.12
NoureldinYosri Jan 24, 2024
3afabf7
nit
NoureldinYosri Jan 24, 2024
8a75a67
revert
NoureldinYosri Jan 24, 2024
b267f8f
revert
NoureldinYosri Jan 24, 2024
8ed44b8
nit
NoureldinYosri Jan 24, 2024
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
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
set(CMAKE_CXX_STANDARD 11)
cmake_minimum_required(VERSION 3.11)
cmake_minimum_required(VERSION 3.12)
NoureldinYosri marked this conversation as resolved.
Show resolved Hide resolved

# Set APPLE_ARM to TRUE if running on Apple Silicon
if(APPLE)
Expand Down
2 changes: 1 addition & 1 deletion install/tests/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM debian

# Install requirements
RUN apt-get update
RUN apt-get install -y python3-dev python3-pip python3-venv python3-packaging
RUN apt-get install -y python3-dev python3-pip python3-venv
RUN apt-get install -y cmake git

# Create venv to avoid collision between system packages (e.g. numpy) and Cirq's deps.
Expand Down
2 changes: 1 addition & 1 deletion pybind_interface/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
FROM qsim

# Install additional requirements
RUN apt-get install -y python3-dev python3-pybind11 python3-pip python3-venv python3-packaging
RUN apt-get install -y python3-dev python3-pybind11 python3-pip python3-venv

# Create venv to avoid collision between system packages (e.g. numpy) and Cirq's deps.
RUN python3 -m venv test_env
Expand Down
2 changes: 1 addition & 1 deletion pybind_interface/GetPybind11.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ if (pybind11_FOUND)
# The pybind11_add_module doesn't correctly set the CXX_INCLUDES properly if a system pybind11 is found.
# Using `include_directories(${pybind11_INCLUDE_DIRS})` doesn't result in anything in
# CXX_INCLUDES. e.g., `pybind_interface/basic/CMakeFiles/qsim_basic.dir/flags.make` would only
# have `CXX_INCLUDES = -isystem $PREFIX/include/python3.11` and would miss `$PREFIX/include`.
# have `CXX_INCLUDES = -isystem $PREFIX/include/python3.12` and would miss `$PREFIX/include`.
# This problem would result in `fatal error: pybind11/complex.h: No such file or directory`
# This is a hack to get around that by passing `-I/path/to/include` to CXX_FLAGS
# Iterate over each include directory and add it as a compile option
Expand Down
2 changes: 1 addition & 1 deletion pybind_interface/avx2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.11)
cmake_minimum_required(VERSION 3.12)
project(qsim)

IF (WIN32)
Expand Down
2 changes: 1 addition & 1 deletion pybind_interface/avx512/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.11)
cmake_minimum_required(VERSION 3.12)
project(qsim)


Expand Down
2 changes: 1 addition & 1 deletion pybind_interface/basic/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.11)
cmake_minimum_required(VERSION 3.12)
project(qsim)

if(WIN32)
Expand Down
2 changes: 1 addition & 1 deletion pybind_interface/cuda/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.11)
cmake_minimum_required(VERSION 3.12)
project(qsim LANGUAGES CXX CUDA)

if(WIN32)
Expand Down
2 changes: 1 addition & 1 deletion pybind_interface/custatevec/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

cmake_minimum_required(VERSION 3.11)
cmake_minimum_required(VERSION 3.12)
project(qsim LANGUAGES CXX CUDA)

if(WIN32)
Expand Down
2 changes: 1 addition & 1 deletion pybind_interface/decide/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.11)
cmake_minimum_required(VERSION 3.12)

if(WIN32)
set(CMAKE_CXX_FLAGS "/O2 /openmp")
Expand Down
2 changes: 1 addition & 1 deletion pybind_interface/sse/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.11)
cmake_minimum_required(VERSION 3.12)
project(qsim)

IF (WIN32)
Expand Down
Loading