Skip to content

Commit 9ab6692

Browse files
committed
fix: resolved wrong cmd, deps
1 parent 2d88f66 commit 9ab6692

File tree

3 files changed

+47
-50
lines changed

3 files changed

+47
-50
lines changed

cw-mega-sam/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM $BASE_IMAGE
33

44
COPY ./cuda124.patch /tmp/cuda124.patch
55
COPY ./requirements.txt /tmp/requirements.txt
6-
RUN python3 -m pip install -U --no-cache-dir \
6+
RUN pip install -U --no-cache-dir \
77
-r /tmp/requirements.txt \
88
&& rm /tmp/requirements.txt
99

@@ -13,11 +13,11 @@ RUN git clone https://github.com/mega-sam/mega-sam && \
1313
git checkout ${COMMIT} && \
1414
rm -rf .git
1515

16-
RUN patch -p1 /tmp/mega-sam < /tmp/cuda124.patch
16+
RUN patch -p2 < /tmp/cuda124.patch
1717

1818

1919

20-
ENTRYPOINT /tmp
21-
CMD echo "Hello! You should only need to run python /tmp/mega-sam/base/setup.py install"
20+
ENTRYPOINT /tmp/mega-sam/base
21+
CMD echo "Hello! You should only need to run python setup.py install from the /tmp/mega-sam/base directory."
2222

2323

cw-mega-sam/cuda124.patch

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
Only in mega-sam/base: dist
2-
Only in mega-sam/base: droid_backends.egg-info
31
diff -crB '--exclude=.git' ref/mega-sam/base/src/altcorr_kernel.cu mega-sam/base/src/altcorr_kernel.cu
42
*** ref/mega-sam/base/src/altcorr_kernel.cu Mon Mar 10 18:15:59 2025
53
--- mega-sam/base/src/altcorr_kernel.cu Mon Mar 10 17:10:59 2025
@@ -745,5 +743,3 @@ diff -crB '--exclude=.git' ref/mega-sam/base/thirdparty/lietorch/lietorch/src/li
745743
jleft_forward_kernel<group_t, scalar_t><<<NUM_BLOCKS(batch_size), NUM_THREADS>>>(
746744
X.data_ptr<scalar_t>(),
747745
a.data_ptr<scalar_t>(),
748-
Only in mega-sam/base/thirdparty/lietorch: lietorch.egg-info
749-
Only in mega-sam/: requirements.txt

cw-mega-sam/requirements.txt

Lines changed: 43 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,41 @@
1-
anaconda-anon-usage @ file:///croot/anaconda-anon-usage_1732732445543/work
2-
annotated-types @ file:///croot/annotated-types_1709542908624/work
3-
archspec @ file:///croot/archspec_1709217642129/work
4-
boltons @ file:///croot/boltons_1737061692168/work
5-
Brotli @ file:///croot/brotli-split_1736182456865/work
6-
certifi @ file:///croot/certifi_1738623731865/work/certifi
7-
cffi @ file:///croot/cffi_1736182485317/work
8-
charset-normalizer @ file:///croot/charset-normalizer_1721748349566/work
9-
conda @ file:///croot/conda_1738168370816/work
10-
conda-anaconda-telemetry @ file:///croot/conda-anaconda-telemetry_1736524596117/work
11-
conda-anaconda-tos @ file:///croot/conda-anaconda-tos_1739298990519/work
12-
conda-content-trust @ file:///croot/conda-content-trust_1714483159009/work
13-
conda-libmamba-solver @ file:///croot/conda-libmamba-solver_1737733694612/work/src
14-
conda-package-handling @ file:///croot/conda-package-handling_1731369017509/work
15-
conda_package_streaming @ file:///croot/conda-package-streaming_1731366181659/work
16-
cryptography @ file:///croot/cryptography_1732129644106/work
17-
distro @ file:///croot/distro_1714488253808/work
1+
anaconda-anon-usage
2+
annotated-types
3+
archspec
4+
boltons
5+
Brotli
6+
certifi
7+
cffi
8+
charset-normalizer
9+
conda
10+
conda-anaconda-telemetry
11+
conda-anaconda-tos
12+
conda-content-trust
13+
conda-libmamba-solver
14+
conda-package-handling
15+
conda_package_streaming
16+
cryptography
17+
distro
1818
droid_backends==0.0.0
1919
filelock==3.17.0
20-
frozendict @ file:///croot/frozendict_1713194832637/work
20+
frozendict
2121
fsspec==2025.3.0
22-
idna @ file:///croot/idna_1714398848350/work
22+
idna
2323
Jinja2==3.1.6
24-
jsonpatch @ file:///croot/jsonpatch_1714483231291/work
24+
jsonpatch
2525
jsonpointer==2.1
26-
libmambapy @ file:///croot/mamba-split_1734469461757/work/libmambapy
26+
libmambapy
2727
lietorch==0.2
28-
markdown-it-py @ file:///work/perseverance-python-buildout/croot/markdown-it-py_1698846045803/work
28+
markdown-it-py
2929
MarkupSafe==3.0.2
30-
mdurl @ file:///work/perseverance-python-buildout/croot/mdurl_1698845653285/work
31-
menuinst @ file:///croot/menuinst_1738943416351/work
30+
mdurl
31+
menuinst
3232
mpmath==1.3.0
3333
networkx==3.4.2
3434
numpy==2.2.3
3535
nvidia-cublas-cu12==12.4.5.8
3636
nvidia-cuda-cupti-cu12==12.4.127
3737
nvidia-cuda-nvrtc-cu12==12.4.127
38+
nvidia-cuda-nvrtc-cu12==12.4.127
3839
nvidia-cuda-runtime-cu12==12.4.127
3940
nvidia-cudnn-cu12==9.1.0.70
4041
nvidia-cufft-cu12==11.2.1.3
@@ -45,29 +46,29 @@ nvidia-cusparselt-cu12==0.6.2
4546
nvidia-nccl-cu12==2.21.5
4647
nvidia-nvjitlink-cu12==12.4.127
4748
nvidia-nvtx-cu12==12.4.127
48-
packaging @ file:///croot/packaging_1734472117206/work
49+
packaging
4950
pillow==11.1.0
50-
platformdirs @ file:///work/perseverance-python-buildout/croot/platformdirs_1701732573265/work
51-
pluggy @ file:///croot/pluggy_1733169602837/work
52-
pycosat @ file:///croot/pycosat_1736868416091/work
53-
pycparser @ file:///tmp/build/80754af9/pycparser_1636541352034/work
54-
pydantic @ file:///croot/pydantic_1734736067156/work
55-
pydantic_core @ file:///croot/pydantic-core_1734726052986/work
56-
Pygments @ file:///work/perseverance-python-buildout/croot/pygments_1698846270603/work
57-
PySocks @ file:///work/perseverance-python-buildout/croot/pysocks_1698845478203/work
58-
requests @ file:///croot/requests_1730999120400/work
59-
rich @ file:///croot/rich_1732638981168/work
60-
ruamel.yaml @ file:///croot/ruamel.yaml_1727980156079/work
61-
ruamel.yaml.clib @ file:///croot/ruamel.yaml.clib_1727769819935/work
51+
platformdirs
52+
pluggy
53+
pycosat
54+
pycparser
55+
pydantic
56+
pydantic_core
57+
Pygments
58+
PySocks
59+
requests
60+
rich
61+
ruamel.yaml
62+
ruamel.yaml.clib
6263
setuptools==75.8.0
6364
sympy==1.13.1
6465
torch==2.6.0
6566
torchaudio==2.6.0
6667
torchvision==0.21.0
67-
tqdm @ file:///croot/tqdm_1738943501192/work
68+
tqdm
6869
triton==3.2.0
69-
truststore @ file:///croot/truststore_1736550121485/work
70-
typing_extensions @ file:///croot/typing_extensions_1734714854207/work
71-
urllib3 @ file:///croot/urllib3_1737133630106/work
70+
truststore
71+
typing_extensions
72+
urllib3
7273
wheel==0.45.1
73-
zstandard @ file:///croot/zstandard_1731356346222/work
74+
zstandard

0 commit comments

Comments
 (0)