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.

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

PINNED: diff against upstream #1

Draft
wants to merge 181 commits into
base: main
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
181 commits
Select commit Hold shift + click to select a range
4c8f53b
prepare a smaller dep set with conda
jokester Apr 20, 2024
5f420f1
new entrypoint
jokester Apr 20, 2024
674dd1c
wip
jokester Apr 20, 2024
7a58f3e
minor changes
jokester Apr 20, 2024
0457293
prevent DivideByZeroError
jokester Apr 20, 2024
2747b70
disable unused CLI/web entrypoint
jokester Apr 20, 2024
f134b5a
get translators working
jokester Apr 20, 2024
33fed3a
remove unused env
jokester Apr 22, 2024
55dc200
CI: build mit-worker image
jokester Apr 29, 2024
3ac14e2
run new workflow on push
jokester Apr 29, 2024
d0fed2d
cleanup github action disk space
jokester Apr 29, 2024
f0610c6
run unix2dos
jokester Jun 26, 2024
ca8dca6
Merge remote-tracking branch 'origin/main' into moeflow-companion-main
jokester Jun 26, 2024
c08a55e
init venv with conda
jokester May 26, 2024
f8aad36
revert dos2unix
jokester Jun 26, 2024
e8f99bf
downgrade numpy
jokester Jul 2, 2024
a722bf7
upgrade openai: conda
jokester Jul 2, 2024
ed3a031
wip
jokester Jul 16, 2024
35d9ef3
Merge remote-tracking branch 'upstream/main' into moeflow-companion-main
jokester Jul 16, 2024
ac91c1a
Merge remote-tracking branch 'origin/main' into moeflow-companion-main
jokester Oct 10, 2024
337b359
Merge remote-tracking branch 'upstream/main' into moeflow-companion-main
jokester Oct 26, 2024
26999c9
checkin experiment code
jokester Nov 7, 2024
68a87ed
wip
jokester Nov 9, 2024
9402e03
install python/torch deps from conda repo
jokester Nov 9, 2024
5bfec89
downgrade torch to workaround 'operator::nms' error
jokester Nov 9, 2024
bd915aa
wip
jokester Nov 11, 2024
6aaa580
update
jokester Nov 15, 2024
5f398bf
wip
jokester Nov 15, 2024
edcf255
share+test
frederik-uni Nov 15, 2024
60854c1
add lock
frederik-uni Nov 15, 2024
3249628
nonce check
frederik-uni Nov 15, 2024
cfb12f5
progress report
frederik-uni Nov 15, 2024
ff55207
re-enable simple requests without progress reporting
frederik-uni Nov 15, 2024
263adce
mount cache as mambauser uid/gid
jokester Nov 16, 2024
bd5ed78
Merge pull request #6 from moeflow-com/switch-micromamba
jokester Nov 16, 2024
c6f179b
Merge remote-tracking branch 'upstream/main' into moeflow-companion-main
jokester Nov 16, 2024
0458122
config structure
frederik-uni Nov 16, 2024
5711acc
i have python. why bellow?
frederik-uni Nov 16, 2024
c5feafe
update to enum
frederik-uni Nov 16, 2024
2ccd802
split manga_translator.py into multiple files
frederik-uni Nov 16, 2024
ed2352a
rename batch, demo to local
frederik-uni Nov 16, 2024
b7c8ace
use config in manga_translator
frederik-uni Nov 17, 2024
36a1a14
use config in manga_translator
frederik-uni Nov 17, 2024
341b545
more ctx fixes
frederik-uni Nov 17, 2024
0cef143
Merge remote-tracking branch 'origin/main' into config
frederik-uni Nov 17, 2024
796d6d3
wip
jokester Nov 17, 2024
1ef7c17
run with single image
jokester Nov 17, 2024
781243f
wip
jokester Nov 17, 2024
fe238a9
wip
jokester Nov 17, 2024
14bc8ca
move preprocessing into config
frederik-uni Nov 17, 2024
82f6ea4
replace ctx in components
frederik-uni Nov 17, 2024
f8996c5
fix imports
frederik-uni Nov 17, 2024
e29f484
move file
jokester Nov 17, 2024
e23510c
fix stuff i forgot
frederik-uni Nov 17, 2024
fa6cd8e
convert str to enum in translatorchain
frederik-uni Nov 17, 2024
c3829f1
wip
jokester Nov 17, 2024
d9aab23
fix
jokester Nov 17, 2024
e8ad19e
wip
jokester Nov 17, 2024
1b30b79
fix
jokester Nov 17, 2024
e2bb9f1
workaround empty textline
jokester Nov 17, 2024
a9cb4d3
Merge remote-tracking branch 'upstream/main' into add-gradio-ui
jokester Nov 17, 2024
3ecfe04
fix
jokester Nov 17, 2024
52609bd
tune logs
jokester Nov 17, 2024
815dcd3
workaround empty textline
jokester Nov 17, 2024
d8458f9
docker_prepare: allow set of models/continue_on_error
jokester Nov 17, 2024
16d86a5
type annotations
jokester Nov 17, 2024
73c5516
enable gradio queue
jokester Nov 17, 2024
f6d3be0
Update manga_translator.py
popcion Nov 17, 2024
518fdf5
Update README.md
popcion Nov 17, 2024
e5b3794
Update README_CN.md
popcion Nov 17, 2024
6827c88
minor changes
jokester Nov 17, 2024
b0d6380
Merge pull request #7 from moeflow-com/add-gradio-ui
jokester Nov 17, 2024
85d6739
circular import fix
frederik-uni Nov 18, 2024
2d87f49
load empty config
frederik-uni Nov 18, 2024
c6b39d3
fix inpainting
frederik-uni Nov 19, 2024
43625c6
fix inpainting
frederik-uni Nov 19, 2024
b73d1dd
load from config
frederik-uni Nov 19, 2024
4aeeb01
Merge remote-tracking branch 'origin/shared' into server
frederik-uni Nov 19, 2024
f473ed7
server
frederik-uni Nov 19, 2024
f809568
fix pre & post dict
frederik-uni Nov 19, 2024
5c672c0
Merge remote-tracking branch 'origin/config' into server
frederik-uni Nov 19, 2024
bc7f2fc
python sucks
frederik-uni Nov 19, 2024
30d9b35
api logic
frederik-uni Nov 19, 2024
b66237e
replace api
frederik-uni Nov 19, 2024
897070c
server refactor
frederik-uni Nov 19, 2024
d0e48b9
stream update
frederik-uni Nov 19, 2024
3be082d
stream_image,stream_json now working
frederik-uni Nov 20, 2024
8aa1f2b
remove old tasks on interrupt connection
frederik-uni Nov 20, 2024
0160a3e
change routes
frederik-uni Nov 20, 2024
aa94927
api goals
frederik-uni Nov 20, 2024
4dfe04c
more todos & args
frederik-uni Nov 20, 2024
29a7625
some docs & queue fix
frederik-uni Nov 21, 2024
5e16387
stream type fix
frederik-uni Nov 21, 2024
0c3908e
add server ui
frederik-uni Nov 21, 2024
b462d12
delete old code
frederik-uni Nov 21, 2024
75f07f4
changed queue a bit
frederik-uni Nov 21, 2024
bba5fc6
custom queue element with deconstructor
frederik-uni Nov 21, 2024
a9d6e18
remove an indent
frederik-uni Nov 21, 2024
7085db8
Merge remote-tracking branch 'origin/shared' into server
frederik-uni Nov 21, 2024
259b807
byte response with cpp&rs examples
frederik-uni Nov 22, 2024
cbf902d
move files into examples
frederik-uni Nov 22, 2024
a2f98e6
fix docs
frederik-uni Nov 22, 2024
a0525dd
convert to normal enum
frederik-uni Nov 22, 2024
85177ed
Merge remote-tracking branch 'origin/config' into server
frederik-uni Nov 22, 2024
322ea78
configs
frederik-uni Nov 22, 2024
effed2c
Merge pull request #744 from frederik-uni/shared
zyddnys Nov 23, 2024
cc89fe6
Merge pull request #746 from moeflow-com/minor-fixes
zyddnys Nov 23, 2024
661fd5e
Merge pull request #747 from popcion/main
zyddnys Nov 23, 2024
b6cb63d
Merge remote-tracking branch 'origin/main' into config
frederik-uni Nov 23, 2024
c9d8cbe
fix ctx -> config after merge
frederik-uni Nov 23, 2024
510db7f
server
frederik-uni Nov 19, 2024
55c59b6
python sucks
frederik-uni Nov 19, 2024
0d8d582
api logic
frederik-uni Nov 19, 2024
bc3f02e
replace api
frederik-uni Nov 19, 2024
536859e
server refactor
frederik-uni Nov 19, 2024
4a8ec99
stream update
frederik-uni Nov 19, 2024
85d7b1e
stream_image,stream_json now working
frederik-uni Nov 20, 2024
d07e7dc
remove old tasks on interrupt connection
frederik-uni Nov 20, 2024
e9ef901
change routes
frederik-uni Nov 20, 2024
c42c9f6
api goals
frederik-uni Nov 20, 2024
b53b79e
more todos & args
frederik-uni Nov 20, 2024
06e04ca
some docs & queue fix
frederik-uni Nov 21, 2024
cbd01ad
stream type fix
frederik-uni Nov 21, 2024
858675a
add server ui
frederik-uni Nov 21, 2024
8aeff8e
delete old code
frederik-uni Nov 21, 2024
aef0a27
changed queue a bit
frederik-uni Nov 21, 2024
cc37ca2
custom queue element with deconstructor
frederik-uni Nov 21, 2024
6cd1819
byte response with cpp&rs examples
frederik-uni Nov 22, 2024
cf7412e
move files into examples
frederik-uni Nov 22, 2024
aac997e
fix docs
frederik-uni Nov 22, 2024
589e037
configs
frederik-uni Nov 22, 2024
6c6a4b5
delete old code & move file
frederik-uni Nov 23, 2024
38a3a5b
Merge remote-tracking branch 'origin/server' into server
frederik-uni Nov 23, 2024
cb98b6d
gpt 3.5 fix
frederik-uni Nov 23, 2024
ef120c0
Merge remote-tracking branch 'origin/config' into server
frederik-uni Nov 23, 2024
361e0ba
Merge remote-tracking branch 'upstream/main' into moeflow-companion-main
jokester Nov 24, 2024
702101d
wip
jokester Nov 24, 2024
58ada4f
wip
jokester Nov 24, 2024
0c4a06e
revert
jokester Nov 24, 2024
38b2143
fix
jokester Nov 24, 2024
11c8172
Merge pull request #8 from moeflow-com/add-gradio-ui
jokester Nov 28, 2024
26fb926
Merge pull request #745 from frederik-uni/config
zyddnys Nov 30, 2024
20808d2
Merge pull request #751 from frederik-uni/server
zyddnys Nov 30, 2024
e406228
fix #703
zyddnys Nov 30, 2024
1fc572c
fix
zyddnys Nov 30, 2024
260dd0a
some docs
frederik-uni Nov 30, 2024
a458b7f
add toml support
frederik-uni Nov 30, 2024
cb1a5a3
issues with main.py when executing with command line
frederik-uni Nov 30, 2024
de441a4
typo
frederik-uni Nov 30, 2024
1b441b8
why does the order matter?
frederik-uni Nov 30, 2024
cb2ed24
why does the order matter?
frederik-uni Nov 30, 2024
9a19389
this shouldnt be here
frederik-uni Nov 30, 2024
e979c43
fixes #760
frederik-uni Dec 1, 2024
3b1870c
Merge pull request #759 from frederik-uni/docs
zyddnys Dec 1, 2024
837b31f
pin httpx version
jokester Dec 1, 2024
2df0c17
switch base image & simplify Dockerfile
jokester Dec 1, 2024
62a917e
skip dockerhub login in forks
jokester Dec 1, 2024
147c26a
Merge remote-tracking branch 'upstream/main' into moeflow-companion-main
jokester Dec 1, 2024
3de516c
Merge branch 'switch-docker-base-image' into moeflow-companion-main
jokester Dec 1, 2024
f6c9de1
make gh action happy
jokester Dec 1, 2024
55556d9
make gh action happy
jokester Dec 1, 2024
1bd5122
remove installation from debian repo
jokester Dec 1, 2024
d3e67fa
remove debian packages
jokester Dec 1, 2024
d74ed22
defining an arg in the constructor might be easier than catching the …
frederik-uni Dec 1, 2024
25bc252
Merge pull request #762 from moeflow-com/fix-dep-fails
zyddnys Dec 1, 2024
ad577f2
Merge pull request #763 from moeflow-com/switch-docker-base-image
zyddnys Dec 1, 2024
2c455dc
Merge pull request #764 from frederik-uni/fix-translator.textlines
zyddnys Dec 1, 2024
3d9b532
fix
jokester Dec 1, 2024
7126b3e
tune deps
jokester Dec 1, 2024
0dede5d
Merge pull request #766 from moeflow-com/fix-dockerbuild
zyddnys Dec 6, 2024
0216cdc
Merge remote-tracking branch 'upstream/main' into moeflow-companion-main
jokester Dec 7, 2024
bf7c1b7
move files
jokester Dec 7, 2024
62e4dc2
wip
jokester Dec 7, 2024
68299dc
fix
jokester Dec 7, 2024
02f0e58
wip
jokester Dec 7, 2024
2a5a27c
fix
jokester Dec 7, 2024
74d1c25
adjust UI
jokester Dec 7, 2024
6ea0c3a
export moeflow archive
jokester Dec 7, 2024
6b4294b
workaround
jokester Dec 7, 2024
d4c8402
set default from cuda availability
jokester Dec 10, 2024
8729593
Merge pull request #9 from moeflow-com/gradio-add-translate-packager
jokester Dec 10, 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
Next Next commit
prepare a smaller dep set with conda
  • Loading branch information
jokester committed Apr 20, 2024
commit 4c8f53be14019ba1bfc3030ab8853e9a80ef61c0
127 changes: 127 additions & 0 deletions conda.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
name: mit-py311
channels:
- pytorch
- nvidia
- defaults
dependencies:
- _libgcc_mutex=0.1=main
- _openmp_mutex=5.1=1_gnu
- blas=1.0=mkl
- brotli-python=1.0.9=py311h6a678d5_7
- bzip2=1.0.8=h5eee18b_5
- ca-certificates=2024.3.11=h06a4308_0
- certifi=2024.2.2=py311h06a4308_0
- charset-normalizer=2.0.4=pyhd3eb1b0_0
- cuda-cudart=12.1.105=0
- cuda-cupti=12.1.105=0
- cuda-libraries=12.1.0=0
- cuda-nvrtc=12.1.105=0
- cuda-nvtx=12.1.105=0
- cuda-opencl=12.4.127=0
- cuda-runtime=12.1.0=0
- ffmpeg=4.3=hf484d3e_0
- filelock=3.13.1=py311h06a4308_0
- freetype=2.12.1=h4a9f257_0
- gmp=6.2.1=h295c915_3
- gmpy2=2.1.2=py311hc9b5ff0_0
- gnutls=3.6.15=he1e5248_0
- idna=3.4=py311h06a4308_0
- intel-openmp=2023.1.0=hdb19cb5_46306
- jinja2=3.1.3=py311h06a4308_0
- jpeg=9e=h5eee18b_1
- lame=3.100=h7b6447c_0
- lcms2=2.12=h3be6417_0
- ld_impl_linux-64=2.38=h1181459_1
- lerc=3.0=h295c915_0
- libcublas=12.1.0.26=0
- libcufft=11.0.2.4=0
- libcufile=1.9.1.3=0
- libcurand=10.3.5.147=0
- libcusolver=11.4.4.55=0
- libcusparse=12.0.2.55=0
- libdeflate=1.17=h5eee18b_1
- libffi=3.4.4=h6a678d5_0
- libgcc-ng=11.2.0=h1234567_1
- libgomp=11.2.0=h1234567_1
- libiconv=1.16=h7f8727e_2
- libidn2=2.3.4=h5eee18b_0
- libjpeg-turbo=2.0.0=h9bf148f_0
- libnpp=12.0.2.50=0
- libnvjitlink=12.1.105=0
- libnvjpeg=12.1.1.14=0
- libpng=1.6.39=h5eee18b_0
- libstdcxx-ng=11.2.0=h1234567_1
- libtasn1=4.19.0=h5eee18b_0
- libtiff=4.5.1=h6a678d5_0
- libunistring=0.9.10=h27cfd23_0
- libuuid=1.41.5=h5eee18b_0
- libwebp-base=1.3.2=h5eee18b_0
- llvm-openmp=14.0.6=h9e868ea_0
- lz4-c=1.9.4=h6a678d5_0
- markupsafe=2.1.3=py311h5eee18b_0
- mkl=2023.1.0=h213fc3f_46344
- mkl-service=2.4.0=py311h5eee18b_1
- mkl_fft=1.3.8=py311h5eee18b_0
- mkl_random=1.2.4=py311hdb19cb5_0
- mpc=1.1.0=h10f8cd9_1
- mpfr=4.0.2=hb69a4c5_1
- mpmath=1.3.0=py311h06a4308_0
- ncurses=6.4=h6a678d5_0
- nettle=3.7.3=hbbd107a_1
- networkx=3.1=py311h06a4308_0
- numpy=1.26.4=py311h08b1b3b_0
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Remove duplicate numpy declaration.

numpy is declared twice with potentially conflicting versions:

  1. In conda dependencies: numpy=1.26.4
  2. In pip dependencies: numpy==1.26.4

While they currently specify the same version, having duplicate declarations can lead to confusion and potential conflicts in future updates.

Remove the pip declaration since the conda one is sufficient:

- numpy==1.26.4

Also applies to: 106-106

- numpy-base=1.26.4=py311hf175353_0
- openh264=2.1.1=h4ff587b_0
- openjpeg=2.4.0=h3ad879b_0
- openssl=3.0.13=h7f8727e_0
- pillow=10.2.0=py311h5eee18b_0
- pip=23.3.1=py311h06a4308_0
- pysocks=1.7.1=py311h06a4308_0
- python=3.11.8=h955ad1f_0
- pytorch=2.2.2=py3.11_cuda12.1_cudnn8.9.2_0
- pytorch-cuda=12.1=ha16c6d3_5
- pytorch-mutex=1.0=cuda
- pyyaml=6.0.1=py311h5eee18b_0
- readline=8.2=h5eee18b_0
- requests=2.31.0=py311h06a4308_1
- setuptools=68.2.2=py311h06a4308_0
- sqlite=3.41.2=h5eee18b_0
- sympy=1.12=py311h06a4308_0
- tbb=2021.8.0=hdb19cb5_0
- tk=8.6.12=h1ccaba5_0
- torchaudio=2.2.2=py311_cu121
- torchtriton=2.2.0=py311
- torchvision=0.17.2=py311_cu121
- typing_extensions=4.9.0=py311h06a4308_1
- tzdata=2024a=h04d1e81_0
- urllib3=2.1.0=py311h06a4308_1
- wheel=0.41.2=py311h06a4308_0
- xz=5.4.6=h5eee18b_0
- yaml=0.2.5=h7b6447c_0
- zlib=1.2.13=h5eee18b_0
- zstd=1.5.5=hc292b87_0
- pip:
- pydensecrf@https://github.com/lucasb-eyer/pydensecrf/archive/refs/heads/master.zip
- opencv-python
- celery==5.3.6
- celery[redis]==5.3.6
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Simplify redundant celery declarations.

The celery package is declared twice:

celery==5.3.6
celery[redis]==5.3.6

Combine these into a single declaration:

- celery==5.3.6
- celery[redis]==5.3.6
+ celery[redis]==5.3.6

- asgiref
- aiohttp
- omegaconf==2.3.0
- langcodes
- marshmallow
- colorama
- tqdm
- einops
- shapely
- scikit-image
- pyclipper
- python-dotenv
- py3langid
- timm
- redis
- manga-ocr
- pymongo
- pandas
- onnxruntime