Skip to content

Commit 13404c2

Browse files
committed
feat: pcgv3 ingest support
1 parent 60ff427 commit 13404c2

File tree

4 files changed

+23
-4
lines changed

4 files changed

+23
-4
lines changed

docker/Dockerfile.all_pcg

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22
ARG PYTHON_VERSION=312
3-
ARG GRAPH_TOOL_VERSION="2.88"
3+
ARG GRAPH_TOOL_VERSION="2.97"
44
ARG GRAPH_TOOL_MICROARCH="x86_64_v3"
55

66
FROM "us-central1-docker.pkg.dev/zetta-research/zutils/zutils_base:cuda12.6_cudnn9.5.1_torch2.6.0_py${PYTHON_VERSION}"
@@ -18,7 +18,8 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
1818
--mount=type=cache,target=/root/.cache/pip,sharing=locked \
1919
savedAptMark="$(apt-mark showmanual)" \
2020
&& cd /opt/zetta_utils \
21-
&& CONDA_OVERRIDE_ARCHSPEC=${GRAPH_TOOL_MICROARCH} conda install graph-tool-base=${GRAPH_TOOL_VERSION} \
21+
# && CONDA_OVERRIDE_ARCHSPEC=${GRAPH_TOOL_MICROARCH} conda install -c conda-forge graph-tool-base=${GRAPH_TOOL_VERSION} \
22+
&& conda install -c conda-forge graph-tool-base=${GRAPH_TOOL_VERSION} \
2223
&& ./install_zutils.py --dockerfile --mode modules --pcg \
2324
&& rm -rf /root/.cache/bazel/ \
2425
&& apt-mark auto '.*' > /dev/null \

install_zutils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -611,7 +611,7 @@ def main():
611611
parser.add_argument(
612612
"--pcg", action="store_true", default=False, help="Whether or not to install PCG"
613613
)
614-
parser.add_argument("--pcgtag", default="stitch_test_x6", help="PCG repo tag to use")
614+
parser.add_argument("--pcgtag", default="v3_stitch_test_x3", help="PCG repo tag to use")
615615

616616
args = parser.parse_args()
617617

zetta_utils/common/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@
1010
from .path import abspath, is_local
1111
from .pprint import lrpad
1212
from .signal_handlers import custom_signal_handler_ctx
13-
from .timer import RepeatTimer
13+
from .timer import RepeatTimer, Timer

zetta_utils/common/timer.py

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,22 @@
1+
from __future__ import annotations
2+
13
import threading
4+
import time
5+
6+
import attrs
7+
8+
9+
@attrs.mutable
10+
class Timer: # pragma: no cover
11+
start: float = 0.0
12+
elapsed: float = 0.0
13+
14+
def __enter__(self):
15+
self.start = time.perf_counter()
16+
return self
17+
18+
def __exit__(self, *args):
19+
self.elapsed = time.perf_counter() - self.start
220

321

422
class RepeatTimer(threading.Timer):

0 commit comments

Comments
 (0)