Closed zikun-li closed 1 year ago
I've resolved all conflicts I know, @Co1lin could you please take a look at the remaining ones?
python/quartz/_cython/CCore.pxd
python/quartz/_cython/core.pyx
src/python/verifier/gates.py
src/quartz/gate/gates.inc.h
src/quartz/tasograph/tasograph.cpp
@zikun-li Hi, please take a look at these files.
P.S. The compilation fails here. I hope merging it into master can solve this.
Looks like we need to merge master
onto rl
first?
We need to merge RL to the master branch. The pirmary changes on the RL branch are: