Skip to content

[Draft] Lazily create TrialResult.final_simulator_state #4198

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

Closed
wants to merge 197 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
197 commits
Select commit Hold shift + click to select a range
293374d
split
daxfohl May 6, 2021
4faff08
Allow config param split_entangled_states
daxfohl May 6, 2021
8c202a4
default split to off
daxfohl May 7, 2021
54f1eea
ensure consistent_act_on circuits have a qubit.
daxfohl May 7, 2021
265d939
lint
daxfohl May 7, 2021
099ecc5
lint
daxfohl May 7, 2021
a698893
mps
daxfohl May 7, 2021
251eeb4
lint
daxfohl May 7, 2021
a255905
lint
daxfohl May 7, 2021
6f58842
run sparse by default
daxfohl May 7, 2021
b7254f9
fix tests
daxfohl May 7, 2021
79e77b2
fix tests
daxfohl May 7, 2021
4d301e5
fix tests
daxfohl May 7, 2021
181d5fb
most of sparse and dm
daxfohl May 8, 2021
f982731
clifford
daxfohl May 8, 2021
1ee3468
sim_base
daxfohl May 8, 2021
994d9d4
sim_base
daxfohl May 8, 2021
fe2761c
mps
daxfohl May 8, 2021
3c472b6
turn off on experiments with rounding error
daxfohl May 9, 2021
c4bd708
fix tests
daxfohl May 9, 2021
1ed1f2e
fix tests
daxfohl May 9, 2021
d0cd4f2
fix testsCreate base step result
daxfohl May 11, 2021
ab1f63c
clifford
daxfohl May 11, 2021
bedb9ec
mps
daxfohl May 11, 2021
8b34b11
mps
daxfohl May 11, 2021
58ed8fa
mps
daxfohl May 11, 2021
ba93627
Merge branch 'master' into split
daxfohl May 11, 2021
027e1b6
Merge branch 'split' into sample
daxfohl May 11, 2021
f44b863
Merge branch 'sample' into sample2
daxfohl May 11, 2021
cba2940
tableau
daxfohl May 11, 2021
95683b7
test simulator
daxfohl May 11, 2021
e472b5a
test simulator
daxfohl May 11, 2021
c5e2485
Update simulator_base.py
daxfohl May 11, 2021
44791ae
Drop mps/join
daxfohl May 11, 2021
febd6ab
Merge branch 'split' of https://github.com/daxfohl/Cirq into split
daxfohl May 11, 2021
a77314a
Merge branch 'master' into split
daxfohl May 11, 2021
6613a05
Fix clifford extract
daxfohl May 12, 2021
10cffe3
Merge branch 'master' into split
daxfohl May 12, 2021
b886923
Merge branch 'split' into sample2
daxfohl May 12, 2021
0c02c2b
lint
daxfohl May 12, 2021
d88a3c6
simplify index
daxfohl May 12, 2021
d2a46f1
Add qubits to base class
daxfohl May 12, 2021
72d8df6
Fix clifford sampling
daxfohl May 12, 2021
da785b6
Fix _sim_state_values
daxfohl May 12, 2021
ffccd8b
fix tostring tests, format
daxfohl May 12, 2021
462a842
remove split/join from ch-form
daxfohl May 14, 2021
ce08aae
Merge branch 'master' into split
daxfohl May 14, 2021
97201d9
Merge branch 'split' into sample
daxfohl May 14, 2021
592d202
remove split/join from ch-form
daxfohl May 14, 2021
bc8cf25
push merged state to base layer
daxfohl May 15, 2021
0db5b2f
lint
daxfohl May 16, 2021
a578685
mypy
daxfohl May 16, 2021
ba81f7c
mypy
daxfohl May 16, 2021
b7288f4
mypy
daxfohl May 16, 2021
d56ebd3
Add default arg for zero qubit circuits
daxfohl May 26, 2021
0af64a5
Merge branch 'master' into split
daxfohl May 26, 2021
352eed4
Have last repetition reuse original state repr
daxfohl May 26, 2021
f51a811
Merge branch 'split' of https://github.com/daxfohl/Cirq into split
daxfohl May 26, 2021
766d4b8
Remove cast
daxfohl May 26, 2021
1e3a208
Split all pure initial states by default
daxfohl May 26, 2021
8629086
Detangle on reset channels
daxfohl Jun 3, 2021
f37d5a0
docstrings
daxfohl Jun 3, 2021
dd1fbf8
docstrings
daxfohl Jun 3, 2021
26402b0
docstrings
daxfohl Jun 3, 2021
ce93863
docstrings
daxfohl Jun 3, 2021
1e83ee6
Merge branch 'master' into split
daxfohl Jun 4, 2021
9828350
fix merge
daxfohl Jun 4, 2021
cfa3ada
lint
daxfohl Jun 4, 2021
fe16073
Add unit test for integer states
daxfohl Jun 4, 2021
b2fb89c
format
daxfohl Jun 4, 2021
184d0d9
Add tests for splitting and joining
daxfohl Jun 4, 2021
1bc5176
remove unnecessary qubits param
daxfohl Jun 5, 2021
f874bcd
Clean up default args
daxfohl Jun 5, 2021
e4c5fcc
Fix failing test
daxfohl Jun 5, 2021
bd2f726
Add ActOnArgsContainer
daxfohl Jun 5, 2021
534a59e
Add ActOnArgsContainer
daxfohl Jun 5, 2021
d701f5e
Clean up tests
daxfohl Jun 6, 2021
6f01a77
Clean up tests
daxfohl Jun 6, 2021
e42892c
Clean up tests
daxfohl Jun 6, 2021
1ad4cf8
format
daxfohl Jun 6, 2021
5420919
Fix tests and coverage
daxfohl Jun 6, 2021
8957e9b
Add OperationTarget interface
daxfohl Jun 6, 2021
50f99b6
Fix unit tests
daxfohl Jun 6, 2021
c372796
mypy, lint, mocks, coverage
daxfohl Jun 6, 2021
9f01c2d
coverage
daxfohl Jun 6, 2021
6af822c
Merge branch 'master' into split
daxfohl Jun 6, 2021
cb93306
Merge branch 'split' into sample
daxfohl Jun 6, 2021
7a4b7fd
lint, tests
daxfohl Jun 6, 2021
c6562f9
lint, tests
daxfohl Jun 6, 2021
6917dd0
mypy
daxfohl Jun 6, 2021
1fc8bdf
mypy, tests
daxfohl Jun 6, 2021
dc6ecfc
remove test code
daxfohl Jun 6, 2021
24461f7
test
daxfohl Jun 6, 2021
f8e4989
dead code
daxfohl Jun 6, 2021
fe0362a
mocks
daxfohl Jun 6, 2021
5dc90dd
add log to container
daxfohl Jun 7, 2021
0860077
fix logs
daxfohl Jun 7, 2021
3922452
dead code
daxfohl Jun 7, 2021
5de0783
Merge branch 'split' into sample
daxfohl Jun 7, 2021
4134450
unit test
daxfohl Jun 7, 2021
1446ea0
unit test
daxfohl Jun 7, 2021
9a635c9
dead code
daxfohl Jun 7, 2021
6b1f23a
operationtarget samples
daxfohl Jun 7, 2021
98e2c55
StepResultBase
daxfohl Jun 7, 2021
1cf627f
Mock, format
daxfohl Jun 7, 2021
8a0675e
EmptyActOnArgs
daxfohl Jun 7, 2021
47a81e0
EmptyActOnArgs
daxfohl Jun 7, 2021
3066010
simplify dummyargs
daxfohl Jun 7, 2021
996be64
simplify dummyargs
daxfohl Jun 7, 2021
191a7e8
lint
daxfohl Jun 8, 2021
16a995f
Merge branch 'split' into sample
daxfohl Jun 8, 2021
278bcd3
Add [] to actonargs
daxfohl Jun 10, 2021
f9b2080
Merge branch 'master' into split
daxfohl Jun 10, 2021
9958740
rename _create_act_on_arg
daxfohl Jun 10, 2021
63fe48d
coverage
daxfohl Jun 10, 2021
4719f5f
coverage
daxfohl Jun 10, 2021
2f3b6f6
Default sparse sim to split=false
daxfohl Jun 12, 2021
eae56b1
format
daxfohl Jun 12, 2021
2993f28
Default sparse sim to split=false
daxfohl Jun 12, 2021
8217b07
Default density matrix sim to split=false
daxfohl Jun 12, 2021
ec50741
lint
daxfohl Jun 12, 2021
746afe0
Lazily compute final result
daxfohl Jun 13, 2021
1249072
Backwards compatibility
daxfohl Jun 13, 2021
eaedfff
Backwards compatibility
daxfohl Jun 13, 2021
b5e9a50
format
daxfohl Jun 13, 2021
45aa3d2
Backwards compatibility
daxfohl Jun 13, 2021
3cf33a4
lint
daxfohl Jun 13, 2021
649a663
Allow state as first class
daxfohl Jun 13, 2021
6be4ce4
format
daxfohl Jun 13, 2021
3eec3e2
caching
daxfohl Jun 14, 2021
6653a54
lint
daxfohl Jun 14, 2021
df55deb
lint
daxfohl Jun 14, 2021
50e6978
lint
daxfohl Jun 14, 2021
d834de1
Merge branch 'master' into split
daxfohl Jun 14, 2021
78a1cc1
address review comments
daxfohl Jun 18, 2021
bc64bc6
Merge branch 'master' into temp
daxfohl Jun 19, 2021
c0647f2
lint
daxfohl Jun 19, 2021
41ebd25
Defaults back to split=false
daxfohl Jun 19, 2021
8537aba
add error if setting state when split is enabled
daxfohl Jun 19, 2021
2ccf2ab
Unit tests
daxfohl Jun 19, 2021
dbe38f5
coverage
daxfohl Jun 19, 2021
1d2b325
coverage
daxfohl Jun 19, 2021
da040e6
coverage
daxfohl Jun 19, 2021
145d52c
docs
daxfohl Jun 19, 2021
a1a71cc
Merge branch 'split' into test
daxfohl Jun 21, 2021
a90ad70
conflicts
daxfohl Jun 21, 2021
afd8d9d
conflicts
daxfohl Jun 21, 2021
6ca9c3e
Merge branch 'sample' into temp
daxfohl Jun 21, 2021
c489e3d
cover
daxfohl Jun 21, 2021
c347eb5
Merge branch 'sample' into trial
daxfohl Jun 21, 2021
099fc74
Draw zero-target operations below circuit text diagrams as annotation…
Strilanc Jun 21, 2021
ba2cd7f
Removing noise model check in Simulator initialization (#4216)
asmuzsoy Jun 21, 2021
a2f107c
Expand Floquet calibration to arbitrary FSim gates (#4164)
fedimser Jun 21, 2021
4960e17
Fix extras_require for the cirq metapackage setup.py (#4246)
balopat Jun 21, 2021
4278277
update python version to 3.8 (#4245)
stubbi Jun 21, 2021
7d9e603
[4173] Add atol/rtol for unitary checks in MatrixGate (#4220)
shivanth Jun 21, 2021
81436fe
Support qubits in `MeasurementKey` and update JSON serialization of k…
smitsanghavi Jun 22, 2021
81d2097
Support decompose protocol on `cirq.Moment` (#4251)
maffoo Jun 22, 2021
d7a5b9b
Removes direct URL requirements from cirq[dev-env] (#4249)
balopat Jun 22, 2021
fb28967
Add Optional `name` to `MatrixGate` parameter (#4201)
than4213 Jun 22, 2021
02f3951
add flynt to pytest-minimal (#4250)
balopat Jun 22, 2021
418e08d
Propagate _channel_ from GateOperation to its Gate (#4255)
viathor Jun 23, 2021
700a6c0
add cancel workflow (#4256)
stubbi Jun 23, 2021
2f07cc9
Fix the CZ ops on the Clifford Tableau Implementation (#4182)
BichengYing Jun 23, 2021
aba9fa9
[Docs] Fix dev group link on support page (#4259)
rmlarose Jun 24, 2021
09a2ea5
Support sqrt(iSWAP) and Sycamore gates in Floquet calibration (#4248)
fedimser Jun 24, 2021
36e5f60
Add method to get "mapped_circuit" from CircuitOperations (#4188)
95-martin-orion Jun 24, 2021
ff230df
Update tutorials on calibration (#4258)
rmlarose Jun 25, 2021
6d2cd16
No DeprecationWarning deduping during testing (#4239)
balopat Jun 25, 2021
b1801ab
Add coupler pulse gate (#4130)
dstrain115 Jun 28, 2021
d379571
Refactor private static methods to module functions. (#4231)
than4213 Jun 28, 2021
534b951
Add qubits as a param of PauliSum.matrix() (#4203)
madcpf Jun 28, 2021
608e678
Remove cirq.IonDevice.can_add_operation_into_moment (#4271)
balopat Jun 29, 2021
55417ee
Extract cirq-pasqal (#4241)
balopat Jun 30, 2021
1433621
Fix docker (#4230)
shivanth Jun 30, 2021
680f897
Revert "Support qubits in `MeasurementKey` and update JSON serializat…
95-martin-orion Jun 30, 2021
6b6fc98
fix for issue #4087 (#4103)
NoureldinYosri Jul 2, 2021
6282c06
SimulatorBase independent qubits optimization (#4100)
daxfohl Jul 2, 2021
24bac55
Typescript development in Cirq and prototype Bloch sphere implementat…
seunomonije Jul 2, 2021
c80e463
Add two-qubit unitary decomposition for (inverse) sqrt-iSWAP (#4213)
cduck Jul 3, 2021
504bdbb
Fix behavior of MergeInteractions for tagged partial CZ gates (#4288)
cduck Jul 6, 2021
d850bd0
Add Circuit Optimizer for sqrt-iSWAP (#4224)
cduck Jul 7, 2021
5c3125e
Add py39 testing to CI test matrix. (#4296)
MichaelBroughton Jul 7, 2021
6cfdda7
[XEB] Cycle depths during analysis (#4278)
mpharrigan Jul 7, 2021
e2b4477
Use `partial_trace` to factor density matrix (#4300)
daxfohl Jul 8, 2021
4ec906d
Allow on_each for multi-qubit gates (#4281)
daxfohl Jul 9, 2021
418d067
Remove bazel from repo (#4297)
MichaelBroughton Jul 9, 2021
c8be206
Add reset_each function by analogy with measure_each (#4294)
maffoo Jul 9, 2021
cea9eec
Return self in Operation.with_tags if adding no tags (#4301)
maffoo Jul 9, 2021
52aba59
Switch to using the incremental pylint. Turn on documentation linters…
than4213 Jul 9, 2021
b1a35bf
Revert "Switch to using the incremental pylint. Turn on documentation…
balopat Jul 9, 2021
ada1b09
Add an option to build a PauliSum from a Sympy Boolean expression (#4…
tonybruguier Jul 9, 2021
4852c46
Fix automerge checks (#4308)
balopat Jul 9, 2021
5ca4ab6
Move on_each to Gate, and deprecate SupportsOnEachGate (#4303)
daxfohl Jul 9, 2021
c28646f
Sample independent qubit sets without merging state space (#4110)
daxfohl Jul 12, 2021
64582fd
Merge branch 'trial' into trial3
daxfohl Jul 13, 2021
1143ac1
lint
daxfohl Jul 13, 2021
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 .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ cirq-ionq/**/*.* @dabacon @ColemanCollins @nakardo @gmauricio @quantumlib/cirq-m

cirq-aqt/**/*.* @ma5x @pschindler @alfrisch @quantumlib/cirq-maintainers @vtomole @cduck

cirq-core/cirq/pasqal/**/*.* @HGSilveri @quantumlib/cirq-maintainers @vtomole @cduck
cirq-pasqal/**/*.* @HGSilveri @quantumlib/cirq-maintainers @vtomole @cduck

################################################
# qcvv maintainers @mrwojtek + cirq maintainers
Expand Down
101 changes: 79 additions & 22 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ name: Continuous Integration

on: [ pull_request ]

concurrency:
group: ${{ github.head_ref }}
cancel-in-progress: true

jobs:
quick_test:
name: Misc check
Expand All @@ -10,10 +14,23 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-python@v1
with:
python-version: '3.7'
python-version: '3.8'
architecture: 'x64'
- name: Misc
run: check/misc
packaging_test:
name: Packaging test
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v1
with:
python-version: '3.7'
architecture: 'x64'
- name: Install dependencies
run: pip install -r dev_tools/requirements/deps/packaging.txt
- name: Run packaging test
run: ./dev_tools/packaging/packaging_test.sh
format:
name: Format check
runs-on: ubuntu-20.04
Expand All @@ -23,7 +40,7 @@ jobs:
fetch-depth: 0
- uses: actions/setup-python@v1
with:
python-version: '3.7'
python-version: '3.8'
architecture: 'x64'
- name: Install dependencies
run: pip install -r dev_tools/requirements/deps/format.txt
Expand All @@ -36,7 +53,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-python@v1
with:
python-version: '3.7'
python-version: '3.8'
architecture: 'x64'
- name: Install mypy
run: pip install -r dev_tools/requirements/mypy.env.txt
Expand All @@ -49,7 +66,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-python@v1
with:
python-version: '3.7'
python-version: '3.8'
architecture: 'x64'
- name: Install mypy
run: pip install -r dev_tools/requirements/mypy.env.txt
Expand All @@ -64,7 +81,7 @@ jobs:
fetch-depth: 0
- uses: actions/setup-python@v1
with:
python-version: '3.7'
python-version: '3.8'
architecture: 'x64'
- name: Install changed files test dependencies
run: dev_tools/conf/pip-install-minimal-for-pytest-changed-files.sh
Expand All @@ -77,7 +94,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-python@v1
with:
python-version: '3.7'
python-version: '3.8'
architecture: 'x64'
- name: Install pylint
run: pip install -r dev_tools/requirements/deps/pylint.txt
Expand All @@ -92,7 +109,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-python@v1
with:
python-version: '3.7'
python-version: '3.8'
architecture: 'x64'
- name: Install requirements
run: pip install -r dev_tools/requirements/dev.env.txt
Expand All @@ -107,7 +124,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-python@v1
with:
python-version: '3.7'
python-version: '3.8'
architecture: 'x64'
- name: Install requirements
run: pip install -r dev_tools/requirements/deps/tensorflow-docs.txt
Expand All @@ -130,8 +147,7 @@ jobs:
name: Pytest Ubuntu
strategy:
matrix:
# TODO(#3800): remove 3.6 when Colab switches to 3.7
python-version: [ '3.6', '3.7', '3.8' ]
python-version: [ '3.6', '3.7', '3.8', '3.9' ]
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
Expand All @@ -154,7 +170,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-python@v1
with:
python-version: '3.7'
python-version: '3.8'
architecture: 'x64'
- name: Install requirements
run: |
Expand All @@ -170,16 +186,11 @@ jobs:
fetch-depth: 0
- uses: actions/setup-python@v1
with:
python-version: '3.7'
python-version: '3.8'
architecture: 'x64'
- name: Install requirements
run: |
pip install -r dev_tools/requirements/deps/protos.txt
sudo apt install curl gnupg
curl -fsSL https://bazel.build/bazel-release.pub.gpg | gpg --dearmor > bazel.gpg
sudo mv bazel.gpg /etc/apt/trusted.gpg.d/
echo "deb [arch=amd64] https://storage.googleapis.com/bazel-apt stable jdk1.8" | sudo tee /etc/apt/sources.list.d/bazel.list
sudo apt update && sudo apt install bazel
- name: Build protos
run: check/build-changed-protos
coverage:
Expand All @@ -191,7 +202,7 @@ jobs:
fetch-depth: 0
- uses: actions/setup-python@v1
with:
python-version: '3.7'
python-version: '3.8'
architecture: 'x64'
- name: Install requirements
run: pip install -r dev_tools/requirements/dev.env.txt
Expand All @@ -201,7 +212,7 @@ jobs:
name: Pytest Windows
strategy:
matrix:
python-version: [ '3.7', '3.8' ]
python-version: [ '3.7', '3.8', '3.9' ]
runs-on: windows-2019
steps:
- uses: actions/checkout@v2
Expand All @@ -218,7 +229,7 @@ jobs:
name: Pytest MacOS
strategy:
matrix:
python-version: [ '3.7', '3.8' ]
python-version: [ '3.7', '3.8', '3.9' ]
runs-on: macos-10.15
steps:
- uses: actions/checkout@v2
Expand All @@ -245,7 +256,7 @@ jobs:
fetch-depth: 0
- uses: actions/setup-python@v1
with:
python-version: '3.7'
python-version: '3.8'
architecture: 'x64'
- name: Install requirements
run: pip install -r dev_tools/requirements/isolated-notebooks.env.txt
Expand All @@ -263,7 +274,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-python@v1
with:
python-version: '3.7'
python-version: '3.8'
architecture: 'x64'
- name: Install requirements
run: pip install -r dev_tools/requirements/notebooks.env.txt
Expand All @@ -274,3 +285,49 @@ jobs:
with:
name: notebook-outputs
path: out
ts-build:
name: Bundle file consistency
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
with:
node-version: '14.16.1'
- name: Install npm
run: check/npm ci
- name: Check build matches the current
run: check/ts-build-current
ts-lint:
name: Typescript lint check
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
with:
node-version: '14.16.1'
- name: Install npm
run: check/npm ci
- name: Lint
run: check/ts-lint
ts-test:
name: Typescript tests
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
with:
node-version: '14.16.1'
- name: Install npm dependencies
run: check/npm ci
- name: Unit tests
run: check/ts-test
- name: End to end tests
run: check/ts-test-e2e
ts-coverage:
name: Typescript tests coverage
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
with:
node-version: '14.16.1'
- name: Install npm dependencies
run: check/npm ci
- name: Test
run: check/ts-coverage
2 changes: 1 addition & 1 deletion .github/workflows/release-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-python@v1
with:
python-version: '3.7'
python-version: '3.8'
architecture: 'x64'
- name: Install dependencies
run: |
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@ docs/api_docs
.python-version

# notebook test output
out
out
34 changes: 6 additions & 28 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
FROM python:3.8-slim AS compile-image
FROM python:3.8-slim AS cirq_base

# Install dependencies.
# rm -rf /var/lib/apt/lists/* cleans up apt cache. See https://docs.docker.com/develop/develop-images/dockerfile_best-practices/
RUN DEBIAN_FRONTEND=noninteractive apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
python3-pip \
python3-tk \
texlive-latex-base \
latexmk \
git \
locales \
&& rm -rf /var/lib/apt/lists/*

Expand All @@ -21,28 +17,10 @@ ENV LC_ALL en_US.UTF-8
# Make python3 default
RUN rm -f /usr/bin/python \
&& ln -s /usr/bin/python3 /usr/bin/python

# Create a virtual enironment to copy over into
# the final docker image
RUN python -m venv /opt/venv
ENV PATH="/opt/venv/bin:$PATH"

# Copy current folder instead of cloning.
COPY ./ .
COPY requirements.txt .
COPY ./cirq/contrib/contrib-requirements.txt .
COPY ./dev_tools/conf/pip-list-dev-tools.txt .

RUN pip3 install -r requirements.txt -r contrib-requirements.txt -r pip-list-dev-tools.txt

# Install cirq
#cirq stable image
FROM cirq_base AS cirq_stable
RUN pip3 install cirq

FROM python:3.8-slim AS build-image
COPY --from=compile-image /opt/venv /opt/venv

# Make sure scripts in .local are usable:
ENV PATH="/opt/venv/bin:$PATH"

WORKDIR /Cirq
EXPOSE 8888
##cirq pre_release image
FROM cirq_base AS cirq_pre_release
RUN pip3 install cirq --pre
1 change: 0 additions & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
include requirements.txt
include LICENSE
62 changes: 0 additions & 62 deletions WORKSPACE

This file was deleted.

Loading