From 77f7ac0db2099011be507227d05016c6a576a68b Mon Sep 17 00:00:00 2001 From: ZhiboRao Date: Fri, 20 Sep 2024 17:06:29 +0800 Subject: [PATCH 1/5] add to env --- .github/workflows/codeql.yml | 41 ++++++++++++++++++++++++++++++++++++ environment.yml | 2 +- 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/codeql.yml diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml new file mode 100644 index 0000000..880ac44 --- /dev/null +++ b/.github/workflows/codeql.yml @@ -0,0 +1,41 @@ +name: "CodeQL" + +on: + push: + branches: [ "dev" ] + pull_request: + branches: [ "master" ] + schedule: + - cron: "18 21 * * 0" + +jobs: + analyze: + name: Analyze + runs-on: ubuntu-latest + permissions: + actions: read + contents: read + security-events: write + + strategy: + fail-fast: false + matrix: + language: [ python ] + + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Initialize CodeQL + uses: github/codeql-action/init@v2 + with: + languages: ${{ matrix.language }} + queries: +security-and-quality + + - name: Autobuild + uses: github/codeql-action/autobuild@v2 + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v2 + with: + category: "/language:${{ matrix.language }}" \ No newline at end of file diff --git a/environment.yml b/environment.yml index a3a29a4..dd8d054 100644 --- a/environment.yml +++ b/environment.yml @@ -131,7 +131,7 @@ dependencies: - ipykernel==5.4.2 - ipython==7.19.0 - ipython-genutils==0.2.0 - - django==5.1 + - django==4.1 # - jackframework==0.1.1 - jedi==0.18.0 - jupyter-client==6.1.11 From 00ed3ec601a42eaf059fb5614e795883827e6ceb Mon Sep 17 00:00:00 2001 From: ZhiboRao Date: Fri, 20 Sep 2024 17:21:17 +0800 Subject: [PATCH 2/5] add to env --- environment.yml | 435 ++++++++++++++++++++++++++++-------------------- 1 file changed, 254 insertions(+), 181 deletions(-) diff --git a/environment.yml b/environment.yml index dd8d054..7be8631 100644 --- a/environment.yml +++ b/environment.yml @@ -1,194 +1,267 @@ -name: JackFramework-torch1.7.1 +name: JackFramework-torch2.3.1 channels: - pytorch - - https://mirrors.bfsu.edu.cn/anaconda/pkgs/msys2 - - https://mirrors.bfsu.edu.cn/anaconda/pkgs/pro - - https://mirrors.bfsu.edu.cn/anaconda/pkgs/r - - https://mirrors.bfsu.edu.cn/anaconda/pkgs/free - - https://mirrors.bfsu.edu.cn/anaconda/pkgs/main - defaults + - nvidia + - https://mirrors.bfsu.edu.cn/anaconda/cloud/pytorch/ dependencies: - _libgcc_mutex=0.1=main + - _openmp_mutex=5.1=1_gnu + - abseil-cpp=20230802.0=h6a678d5_2 + - absl-py=1.4.0=py38h06a4308_0 + - aiohttp=3.9.0=py38h5eee18b_0 + - aiosignal=1.2.0=pyhd3eb1b0_0 + - aom=3.6.0=h6a678d5_0 + - asgiref=3.8.1=py38h06a4308_0 + - async-timeout=4.0.3=py38h06a4308_0 + - attrs=23.1.0=py38h06a4308_0 + - backports=1.1=pyhd3eb1b0_1 + - backports.zoneinfo=0.2.1=py38h5eee18b_0 - blas=1.0=mkl - - blosc=1.20.1=hd408876_0 - - brotli=1.0.9=he6710b0_2 + - blinker=1.6.2=py38h06a4308_0 + - blosc=1.21.3=h6a678d5_0 + - bottleneck=1.3.5=py38h7deecbd_0 + - brotli=1.0.9=h5eee18b_7 + - brotli-bin=1.0.9=h5eee18b_7 + - brotli-python=1.0.9=py38h6a678d5_7 + - brunsli=0.1=h2531618_0 - bzip2=1.0.8=h7b6447c_0 - - ca-certificates=2021.5.25=h06a4308_1 - - certifi=2021.5.30=py38h06a4308_0 - - charls=2.1.0=he6710b0_2 - - cloudpickle=1.6.0=py_0 - - cudatoolkit=10.2.89=hfd86e86_1 - - cytoolz=0.11.0=py38h7b6447c_0 - - dask-core=2020.12.0=pyhd3eb1b0_0 + - c-ares=1.19.1=h5eee18b_0 + - ca-certificates=2024.7.2=h06a4308_0 + - cachetools=4.2.2=pyhd3eb1b0_0 + - certifi=2024.8.30=py38h06a4308_0 + - cffi=1.16.0=py38h5eee18b_0 + - cfitsio=3.470=h5893167_7 + - charls=2.2.0=h2531618_0 + - charset-normalizer=2.0.4=pyhd3eb1b0_0 + - click=8.1.7=py38h06a4308_0 + - contourpy=1.0.5=py38hdb19cb5_0 + - cryptography=41.0.7=py38hdda0065_0 + - cuda-cudart=11.8.89=0 + - cuda-cupti=11.8.87=0 + - cuda-libraries=11.8.0=0 + - cuda-nvrtc=11.8.89=0 + - cuda-nvtx=11.8.86=0 + - cuda-opencl=12.3.101=0 + - cuda-runtime=11.8.0=0 + - cycler=0.11.0=pyhd3eb1b0_0 + - cyrus-sasl=2.1.28=h52b45da_1 + - dav1d=1.2.1=h5eee18b_0 - dbus=1.13.18=hb2f20db_0 - - decorator=4.4.2=py_0 - - expat=2.2.10=he6710b0_2 - - fontconfig=2.13.0=h9420a91_0 - - freetype=2.10.4=h5ab3b9f_0 - - giflib=5.1.4=h14c3975_1 - - gitdb=4.0.7=pyhd3eb1b0_0 - - gitdb2=4.0.2=py_0 - - gitpython=3.1.17=pyhd3eb1b0_1 - - glib=2.66.1=h92f7085_0 - - gst-plugins-base=1.14.0=h8213a91_2 - - gstreamer=1.14.0=h28cd5cc_2 - - icu=58.2=he6710b0_3 - - imagecodecs=2020.5.30=py38hfa7d478_2 - - imageio=2.9.0=py_0 - - intel-openmp=2020.2=254 - - jpeg=9b=0 + - django=4.1=py38h06a4308_0 + - expat=2.6.2=h6a678d5_0 + - ffmpeg=4.3=hf484d3e_0 + - filelock=3.13.1=py38h06a4308_0 + - fontconfig=2.14.1=h4c34cd2_2 + - fonttools=4.51.0=py38h5eee18b_0 + - freetype=2.12.1=h4a9f257_0 + - frozenlist=1.4.0=py38h5eee18b_0 + - giflib=5.2.1=h5eee18b_3 + - glib=2.78.4=h6a678d5_0 + - glib-tools=2.78.4=h6a678d5_0 + - gmp=6.2.1=h295c915_3 + - gmpy2=2.1.2=py38heeb90bb_0 + - gnutls=3.6.15=he1e5248_0 + - google-auth=2.22.0=py38h06a4308_0 + - google-auth-oauthlib=0.5.2=py38h06a4308_0 + - grpc-cpp=1.48.2=he1ff14a_4 + - grpcio=1.48.2=py38he1ff14a_4 + - gst-plugins-base=1.14.1=h6a678d5_1 + - gstreamer=1.14.1=h5eee18b_1 + - gtest=1.14.0=hdb19cb5_0 + - icu=73.1=h6a678d5_0 + - idna=3.4=py38h06a4308_0 + - imagecodecs=2023.1.23=py38hc4b7b5f_0 + - importlib-metadata=7.0.1=py38h06a4308_0 + - importlib_resources=6.4.0=py38h06a4308_0 + - intel-openmp=2023.1.0=hdb19cb5_46306 + - jinja2=3.1.2=py38h06a4308_0 + - jpeg=9e=h5eee18b_1 - jxrlib=1.1=h7b6447c_2 - - lcms2=2.11=h396b838_0 - - ld_impl_linux-64=2.33.1=h53a641e_7 + - kiwisolver=1.4.4=py38h6a678d5_0 + - krb5=1.20.1=h143b758_1 + - lame=3.100=h7b6447c_0 + - lcms2=2.12=h3be6417_0 + - ld_impl_linux-64=2.38=h1181459_1 + - lerc=3.0=h295c915_0 - libaec=1.0.4=he6710b0_1 - - libedit=3.1.20191231=h14c3975_1 - - libffi=3.3=he6710b0_2 - - libgcc-ng=9.1.0=hdf63c60_0 - - libgfortran-ng=7.3.0=hdf63c60_0 - - libpng=1.6.37=hbc83047_0 - - libstdcxx-ng=9.1.0=hdf63c60_0 - - libtiff=4.1.0=h2733197_1 - - libuuid=1.0.3=0 - - libuv=1.40.0=h7b6447c_0 - - libwebp=1.0.1=h8e7db2f_0 - - libxcb=1.14=h7b6447c_0 - - libxml2=2.9.10=hb55368b_3 + - libavif=0.11.1=h5eee18b_0 + - libbrotlicommon=1.0.9=h5eee18b_7 + - libbrotlidec=1.0.9=h5eee18b_7 + - libbrotlienc=1.0.9=h5eee18b_7 + - libclang=14.0.6=default_hc6dbbc7_1 + - libclang13=14.0.6=default_he11475f_1 + - libcublas=11.11.3.6=0 + - libcufft=10.9.0.58=0 + - libcufile=1.8.1.2=0 + - libcups=2.4.2=h2d74bed_1 + - libcurand=10.3.4.107=0 + - libcurl=8.5.0=h251f7ec_0 + - libcusolver=11.4.1.48=0 + - libcusparse=11.7.5.86=0 + - libdeflate=1.17=h5eee18b_1 + - libedit=3.1.20230828=h5eee18b_0 + - libev=4.33=h7f8727e_1 + - libffi=3.4.4=h6a678d5_0 + - libgcc-ng=11.2.0=h1234567_1 + - libgfortran-ng=11.2.0=h00389a5_1 + - libgfortran5=11.2.0=h1234567_1 + - libglib=2.78.4=hdc74915_0 + - libgomp=11.2.0=h1234567_1 + - libiconv=1.16=h7f8727e_2 + - libidn2=2.3.4=h5eee18b_0 + - libjpeg-turbo=2.0.0=h9bf148f_0 + - libllvm14=14.0.6=hdb19cb5_3 + - libnghttp2=1.57.0=h2d74bed_0 + - libnpp=11.8.0.86=0 + - libnvjitlink=12.1.105=0 + - libnvjpeg=11.9.0.86=0 + - libpng=1.6.39=h5eee18b_0 + - libpq=12.17=hdbd6064_0 + - libprotobuf=3.20.3=he621ea3_0 + - libssh2=1.10.0=hdbd6064_2 + - 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=1.3.2=h11a3e52_0 + - libwebp-base=1.3.2=h5eee18b_0 + - libxcb=1.15=h7f8727e_0 + - libxkbcommon=1.0.1=h5eee18b_1 + - libxml2=2.10.4=hf1b16e4_1 - libzopfli=1.0.3=he6710b0_0 - - lz4-c=1.9.2=heb0550a_3 - - matplotlib-base=3.3.2=py38h817c723_0 - - mkl=2020.2=256 - - mkl-service=2.3.0=py38he904b0f_0 - - mkl_fft=1.2.0=py38h23d657b_0 - - mkl_random=1.1.1=py38h0573a6f_0 - - ncurses=6.2=he6710b0_1 - - networkx=2.5=py_0 - - ninja=1.7.2=0 - - numpy=1.19.2=py38h54aff64_0 - - numpy-base=1.19.2=py38hfa32c7d_0 - - olefile=0.46=py_0 - - openjpeg=2.3.0=h05c96fa_1 - - openssl=1.1.1k=h27cfd23_0 - - pandas=1.1.5=py38ha9443f7_0 - - pcre=8.44=he6710b0_0 - - pillow=8.0.1=py38he98fc37_0 - - pip=20.3.3=py38h06a4308_0 - - pyparsing=2.4.7=py_0 - - pyqt=5.9.2=py38h05f1152_4 - - python=3.8.5=h7579374_1 - - python-dateutil=2.8.1=py_0 - - pytorch=1.7.1=py3.8_cuda10.2.89_cudnn7.6.5_0 - - pytz=2020.5=pyhd3eb1b0_0 - - pywavelets=1.1.1=py38h7b6447c_2 - - pyyaml=5.3.1=py38h7b6447c_1 - - qt=5.9.7=h5867ecd_1 - - readline=8.0=h7b6447c_0 - - scikit-image=0.17.2=py38hdf5156a_0 - - scipy=1.5.2=py38h0b6359f_0 - - setuptools=51.0.0=py38h06a4308_2 - - sip=4.19.13=py38he6710b0_0 - - six=1.15.0=py38h06a4308_0 - - smmap=3.0.5=pyhd3eb1b0_0 - - snappy=1.1.8=he6710b0_0 - - sqlite=3.33.0=h62c20be_0 - - tifffile=2020.12.8=pyhd3eb1b0_0 - - tk=8.6.10=hbc83047_0 - - toolz=0.11.1=py_0 - - torchaudio=0.7.2=py38 - - torchvision=0.8.2=py38_cu102 - - tornado=6.1=py38h27cfd23_0 - - tqdm=4.55.0=pyhd3eb1b0_0 - - typing-extensions=3.7.4.3=0 - - typing_extensions=3.7.4.3=py_0 - - wheel=0.36.2=pyhd3eb1b0_0 - - xz=5.2.5=h7b6447c_0 + - llvm-openmp=14.0.6=h9e868ea_0 + - lz4-c=1.9.4=h6a678d5_0 + - markdown=3.4.1=py38h06a4308_0 + - markupsafe=2.1.3=py38h5eee18b_0 + - matplotlib=3.7.2=py38h06a4308_0 + - matplotlib-base=3.7.2=py38h1128e8f_0 + - mkl=2023.1.0=h213fc3f_46344 + - mkl-service=2.4.0=py38h5eee18b_1 + - mkl_fft=1.3.8=py38h5eee18b_0 + - mkl_random=1.2.4=py38hdb19cb5_0 + - mpc=1.1.0=h10f8cd9_1 + - mpfr=4.0.2=hb69a4c5_1 + - mpmath=1.3.0=py38h06a4308_0 + - multidict=6.0.4=py38h5eee18b_0 + - mysql=5.7.24=h721c034_2 + - ncurses=6.4=h6a678d5_0 + - nettle=3.7.3=hbbd107a_1 + - networkx=3.1=py38h06a4308_0 + - numexpr=2.8.4=py38hc78ab66_1 + - numpy=1.24.3=py38hf6e8229_1 + - numpy-base=1.24.3=py38h060ed82_1 + - oauthlib=3.2.2=py38h06a4308_0 + - openh264=2.1.1=h4ff587b_0 + - openjpeg=2.4.0=h3ad879b_0 + - openssl=3.0.15=h5eee18b_0 + - packaging=23.2=py38h06a4308_0 + - pandas=2.0.3=py38h1128e8f_0 + - pcre2=10.42=hebb0a14_1 + - pillow=10.0.1=py38ha6cbd5a_0 + - pip=23.3.1=py38h06a4308_0 + - ply=3.11=py38_0 + - protobuf=3.20.3=py38h6a678d5_0 + - pyasn1=0.4.8=pyhd3eb1b0_0 + - pyasn1-modules=0.2.8=py_0 + - pycparser=2.21=pyhd3eb1b0_0 + - pyjwt=2.4.0=py38h06a4308_0 + - pyopenssl=23.2.0=py38h06a4308_0 + - pyparsing=3.0.9=py38h06a4308_0 + - pyqt=5.15.10=py38h6a678d5_0 + - pyqt5-sip=12.13.0=py38h5eee18b_0 + - pysocks=1.7.1=py38h06a4308_0 + - python=3.8.18=h955ad1f_0 + - python-dateutil=2.8.2=pyhd3eb1b0_0 + - python-tzdata=2023.3=pyhd3eb1b0_0 + - pytorch=2.3.1=py3.8_cuda11.8_cudnn8.7.0_0 + - pytorch-cuda=11.8=h7e8668a_5 + - pytorch-mutex=1.0=cuda + - pytz=2023.3.post1=py38h06a4308_0 + - pyyaml=6.0.1=py38h5eee18b_0 + - qt-main=5.15.2=h53bd1ea_10 + - re2=2022.04.01=h295c915_0 + - readline=8.2=h5eee18b_0 + - requests=2.31.0=py38h06a4308_0 + - requests-oauthlib=1.3.0=py_0 + - rsa=4.7.2=pyhd3eb1b0_1 + - setuptools=68.2.2=py38h06a4308_0 + - sip=6.7.12=py38h6a678d5_0 + - six=1.16.0=pyhd3eb1b0_1 + - snappy=1.1.10=h6a678d5_1 + - sqlite=3.41.2=h5eee18b_0 + - sqlparse=0.4.4=py38h06a4308_0 + - sympy=1.12=py38h06a4308_0 + - tbb=2021.8.0=hdb19cb5_0 + - tensorboard=2.12.1=py38h06a4308_0 + - tensorboard-data-server=0.7.0=py38h52d8a92_0 + - tensorboard-plugin-wit=1.8.1=py38h06a4308_0 + - tifffile=2023.4.12=py38h06a4308_0 + - tk=8.6.12=h1ccaba5_0 + - tomli=2.0.1=py38h06a4308_0 + - torchaudio=2.3.1=py38_cu118 + - torchtriton=2.3.1=py38 + - torchvision=0.18.1=py38_cu118 + - tornado=6.4.1=py38h5eee18b_0 + - typing_extensions=4.9.0=py38h06a4308_0 + - tzdata=2024a=h04d1e81_0 + - unicodedata2=15.1.0=py38h5eee18b_0 + - urllib3=1.26.18=py38h06a4308_0 + - werkzeug=2.2.3=py38h06a4308_0 + - wheel=0.41.2=py38h06a4308_0 + - xz=5.4.5=h5eee18b_0 - yaml=0.2.5=h7b6447c_0 - - zlib=1.2.11=0 - - zstd=1.4.5=h9ceee32_0 + - yarl=1.9.3=py38h5eee18b_0 + - zfp=1.0.0=h6a678d5_0 + - zipp=3.17.0=py38h06a4308_0 + - zlib=1.2.13=h5eee18b_0 + - zstd=1.5.5=hc292b87_0 - pip: - - absl-py==0.13.0 - - affine==2.3.0 - - anykeystore==0.2 - # - apex==0.1 - - attrs==20.3.0 - - backcall==0.2.0 - - cachetools==4.2.2 - - chardet==4.0.0 - - click==7.1.2 - - click-plugins==1.1.1 - - cligj==0.7.1 - - cryptacular==1.5.5 - - cycler==0.10.0 - - cython==0.29.21 - - defusedxml==0.6.0 - - efficientnet-pytorch==0.6.3 - - einops==0.3.0 - - fiona==1.8.18 - - google-auth==1.32.1 - - google-auth-oauthlib==0.4.4 - - grpcio==1.38.1 - - hupper==1.10.2 - - idna==2.10 - - ipykernel==5.4.2 - - ipython==7.19.0 - - ipython-genutils==0.2.0 - - django==4.1 - # - jackframework==0.1.1 - - jedi==0.18.0 - - jupyter-client==6.1.11 - - jupyter-core==4.7.0 - - kiwisolver==1.3.1 - - markdown==3.3.4 - - markupsafe==1.1.1 - - matplotlib==3.3.3 - - munch==2.5.0 - - oauthlib==3.1.0 - - opencv-python==4.5.1.48 - - parso==0.8.1 - - pastedeploy==2.1.1 - - pbkdf2==1.3 - - pexpect==4.8.0 - - pickleshare==0.7.5 - - plaster==1.0 - - plaster-pastedeploy==0.7 - - pretrainedmodels==0.7.4 - - prompt-toolkit==3.0.10 - - protobuf==3.14.0 - - ptyprocess==0.7.0 - - pyasn1==0.4.8 - - pyasn1-modules==0.2.8 - - pycocotools==2.0.2 - - pygments==2.7.3 - - pyramid==1.10.5 - - pyramid-mailer==0.15.1 - - python3-openid==3.2.0 - - pyzmq==20.0.0 - - rasterio==1.1.8 - - repoze-sendmail==4.4.1 - - requests==2.25.1 - - requests-oauthlib==1.3.0 - - rlcard==1.0.2 - - rsa==4.7.2 - - segmentation-models-pytorch==0.1.3 - - snuggs==1.4.7 - - sqlalchemy==1.3.22 - - tensorboard==2.5.0 - - tensorboard-data-server==0.6.1 - - tensorboard-plugin-wit==1.8.0 - - tensorboardx==2.1 - - termcolor==1.1.0 - - timm==0.3.2 - - traitlets==5.0.5 - - transaction==3.0.1 - - translationstring==1.4 - - urllib3==1.26.2 - - velruse==1.1.1 - - venusian==3.0.0 - - wcwidth==0.2.5 - - webob==1.8.6 - - werkzeug==2.0.1 - - wtforms==2.3.3 - - wtforms-recaptcha==0.3.2 - - zope-deprecation==4.4.0 - - zope-interface==5.2.0 - - zope-sqlalchemy==1.3 - +# - apex==0.1 + - argparse==1.4.0 + - automat==22.10.0 + - buildtools==1.0.6 + - causal-conv1d==1.2.2.post1 + - constantly==23.10.4 + - dinov2==0.0.1 + - docopt==0.6.2 + - einops==0.8.0 + - fsspec==2024.3.1 + - furl==2.1.3 + - ganet==0.0.0 + - greenlet==3.0.3 + - huggingface-hub==0.23.0 + - hyperlink==21.0.0 + - incremental==22.10.0 +# - jackframework==0.1.1 + - mamba-ssm==2.0.3 + - ninja==1.11.1.1 + - nvidia-cublas-cu11==11.11.3.6 + - nvidia-cuda-cupti-cu11==11.8.87 + - nvidia-cuda-nvrtc-cu11==11.8.89 + - nvidia-cuda-runtime-cu11==11.8.89 + - nvidia-cudnn-cu11==8.7.0.84 + - nvidia-cufft-cu11==10.9.0.58 + - nvidia-curand-cu11==10.3.0.86 + - nvidia-cusolver-cu11==11.4.1.48 + - nvidia-cusparse-cu11==11.7.5.86 + - nvidia-nccl-cu11==2.20.5 + - nvidia-nvtx-cu11==11.8.86 + - opencv-python==4.9.0.80 + - orderedmultidict==1.0.1 + - redo==2.0.4 + - regex==2024.4.28 + - safetensors==0.4.3 + - simplejson==3.19.2 + - sqlalchemy==2.0.29 + - timm==0.9.16 + - tokenizers==0.19.1 + - torch==2.3.0+cu118 + - torchsummary==1.5.1 + - tqdm==4.66.4 + - transformers==4.40.1 + - triton==2.3.0 + - twisted==24.3.0 + - xformers==0.0.26.post1+cu118 + - zope-interface==6.3 \ No newline at end of file From a0c275f75b7da5454661dfe6ab65ce4e7a3da8e3 Mon Sep 17 00:00:00 2001 From: ZhiboRao Date: Fri, 20 Sep 2024 21:29:43 +0800 Subject: [PATCH 3/5] fixed some bugs in action --- README.md | 57 +++++++++++++++++++++++++------------------------ environment.yml | 2 +- 2 files changed, 30 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index 62eedb4..6fa876d 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ [![build test](https://github.com/Archaic-Atom/JackFramework/actions/workflows/build%20test.yml/badge.svg?event=push)](https://github.com/Archaic-Atom/JackFramework/actions/workflows/build%20test.yml) -[![Language grade: Python](https://img.shields.io/lgtm/grade/python/g/1996scarlet/Dense-Head-Pose-Estimation.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/Archaic-Atom/JackFramework/context:python) ![Python 3.8](https://img.shields.io/badge/python-3.8-green.svg?style=plastic) ![Pytorch 1.7](https://img.shields.io/badge/PyTorch%20-%23EE4C2C.svg?style=plastic) ![cuDnn 7.3.6](https://img.shields.io/badge/cudnn-7.3.6-green.svg?style=plastic) @@ -38,7 +37,7 @@ This framework is only used in GPUs. **1) Build env** ``` $ conda env create -f environment.yml -$ conda activate JackFramework-torch1.7.1 +$ conda activate JackFramework-torch2.3.1 ``` **2) Install the JackFramework lib** ``` @@ -56,32 +55,33 @@ you can find the template project in: https://github.com/Archaic-Atom/FameworkTe you can find the demo project in: https://github.com/Archaic-Atom/Demo-jf **Related Arguments for training or testing process** -| Args | Type | Description | Default | -|:-------------:|:-------:|:--------------------------------:|:---------------:| -| mode | [str] | train or test | train | -| gpu | [int] | the number of gpus | 2 | -| auto_save_num | [int] | the number of interval save | 1 | -| dataloaderNum | [int] | the number of dataloader | 8 | -| pretrain | [bool] | is a new training process | False | -| ip | [str] | used for distributed training | 127.0.0.1 | -| port | [str] | used for distributed training | 8086 | -| dist | [bool] | distributed training (DDP) | True | -| trainListPath | [str] | the list for training or testing | ./Datasets/*.csv| -| valListPath | [str] | the list for validate process | ./Datasets/*.csv| -| outputDir | [str] | the folder for log file | ./Result/ | -| modelDir | [str] | the folder for saving model | ./Checkpoint/ | -| resultImgDir | [str] | the folder for output | ./ResultImg/ | -| log | [str] | the folder for tensorboard | ./log/ | -| sampleNum | [int] | the number of sample for data | 1 | -| batchSize | [int] | batch size | 4 | -| lr | [float]| learning rate | 0.001 | -| maxEpochs | [int] | training epoch | 30 | -| imgWidth | [int] | the cutting width | 512 | -| imgHeight | [int] | the cutting height | 256 | -| imgNum | [int] | the number of images for training| 35354 | -| valImgNum | [int] | the number of images for val | 200 | -| modelName | [str] | the model's name | NLCA-Net | -| dataset | [str] | the dataset's name | SceneFlow | +| Args | Type | Description | Default | +|:-------------:|:-------:|:--------------------------------:|:--------------------------------:| +| mode | [str] | train or test | train | +| gpu | [int] | the number of gpus | 2 | +| auto_save_num | [int] | the number of interval save | 1 | +| dataloaderNum | [int] | the number of dataloader | 8 | +| pretrain | [bool] | is a new training process | False | +| ip | [str] | used for distributed training | 127.0.0.1 | +| port | [str] | used for distributed training | 8086 | +| dist | [bool] | distributed training (DDP) | True | +| trainListPath | [str] | the list for training or testing | ./Datasets/*.csv | +| valListPath | [str] | the list for validate process | ./Datasets/*.csv | +| outputDir | [str] | the folder for log file | ./Result/ | +| modelDir | [str] | the folder for saving model | ./Checkpoint/ | +| resultImgDir | [str] | the folder for output | ./ResultImg/ | +| log | [str] | the folder for tensorboard | ./log/ | +| sampleNum | [int] | the number of sample for data | 1 | +| batchSize | [int] | batch size | 4 | +| lr | [float]| learning rate | 0.001 | +| maxEpochs | [int] | training epoch | 30 | +| imgWidth | [int] | the cutting width | 512 | +| imgHeight | [int] | the cutting height | 256 | +| imgNum | [int] | the number of images for training| 35354 | +| valImgNum | [int] | the number of images for val | 200 | +| modelName | [str] | the model's name | NLCA-Net | +| dataset | [str] | the dataset's name | SceneFlow | +| web_cmd | [str] | cmd for django | 'main.py runserver 0.0.0.0:8000' | **5) Clean the project (if you want to clean generating files)** @@ -102,6 +102,7 @@ $ ./clean.sh | | ├── SysBasic/ | | ├── UserTemplate/ | | ├── FileHandler/ +| | ├── Web/ │ | └── ... │ ├── setup.py │ └── ... diff --git a/environment.yml b/environment.yml index 7be8631..18ecc8f 100644 --- a/environment.yml +++ b/environment.yml @@ -222,7 +222,7 @@ dependencies: - argparse==1.4.0 - automat==22.10.0 - buildtools==1.0.6 - - causal-conv1d==1.2.2.post1 +# - causal-conv1d==1.2.2.post1 - constantly==23.10.4 - dinov2==0.0.1 - docopt==0.6.2 From 8fece64e9b39fe11e7293376cb3ee6d22261b386 Mon Sep 17 00:00:00 2001 From: ZhiboRao Date: Fri, 20 Sep 2024 21:37:57 +0800 Subject: [PATCH 4/5] fixed some bugs in action --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index 18ecc8f..0bf3f46 100644 --- a/environment.yml +++ b/environment.yml @@ -223,7 +223,7 @@ dependencies: - automat==22.10.0 - buildtools==1.0.6 # - causal-conv1d==1.2.2.post1 - - constantly==23.10.4 +# - constantly==23.10.4 - dinov2==0.0.1 - docopt==0.6.2 - einops==0.8.0 From c17b75ea69f323a004f94fb86e73593d647d5486 Mon Sep 17 00:00:00 2001 From: ZhiboRao Date: Sat, 21 Sep 2024 14:43:23 +0800 Subject: [PATCH 5/5] fixed some bugs in action --- environment.yml | 260 ++++++++++++++---------------------------------- meta.yaml | 1 + 2 files changed, 76 insertions(+), 185 deletions(-) diff --git a/environment.yml b/environment.yml index 0bf3f46..08233c4 100644 --- a/environment.yml +++ b/environment.yml @@ -7,261 +7,151 @@ channels: dependencies: - _libgcc_mutex=0.1=main - _openmp_mutex=5.1=1_gnu - - abseil-cpp=20230802.0=h6a678d5_2 - - absl-py=1.4.0=py38h06a4308_0 - - aiohttp=3.9.0=py38h5eee18b_0 - - aiosignal=1.2.0=pyhd3eb1b0_0 - - aom=3.6.0=h6a678d5_0 - - asgiref=3.8.1=py38h06a4308_0 - - async-timeout=4.0.3=py38h06a4308_0 - - attrs=23.1.0=py38h06a4308_0 - - backports=1.1=pyhd3eb1b0_1 - - backports.zoneinfo=0.2.1=py38h5eee18b_0 + - absl-py=2.1.0=py310h06a4308_0 + - asgiref=3.8.1=py310h06a4308_0 - blas=1.0=mkl - - blinker=1.6.2=py38h06a4308_0 - - blosc=1.21.3=h6a678d5_0 - - bottleneck=1.3.5=py38h7deecbd_0 - - brotli=1.0.9=h5eee18b_7 - - brotli-bin=1.0.9=h5eee18b_7 - - brotli-python=1.0.9=py38h6a678d5_7 - - brunsli=0.1=h2531618_0 - - bzip2=1.0.8=h7b6447c_0 + - brotli-python=1.0.9=py310h6a678d5_8 + - bzip2=1.0.8=h5eee18b_6 - c-ares=1.19.1=h5eee18b_0 - ca-certificates=2024.7.2=h06a4308_0 - - cachetools=4.2.2=pyhd3eb1b0_0 - - certifi=2024.8.30=py38h06a4308_0 - - cffi=1.16.0=py38h5eee18b_0 - - cfitsio=3.470=h5893167_7 - - charls=2.2.0=h2531618_0 - - charset-normalizer=2.0.4=pyhd3eb1b0_0 - - click=8.1.7=py38h06a4308_0 - - contourpy=1.0.5=py38hdb19cb5_0 - - cryptography=41.0.7=py38hdda0065_0 + - cairo=1.16.0=hb05425b_5 + - certifi=2024.8.30=py310h06a4308_0 + - charset-normalizer=3.3.2=pyhd3eb1b0_0 - cuda-cudart=11.8.89=0 - cuda-cupti=11.8.87=0 - cuda-libraries=11.8.0=0 - cuda-nvrtc=11.8.89=0 - cuda-nvtx=11.8.86=0 - - cuda-opencl=12.3.101=0 - cuda-runtime=11.8.0=0 - - cycler=0.11.0=pyhd3eb1b0_0 + - cuda-version=12.6=3 - cyrus-sasl=2.1.28=h52b45da_1 - - dav1d=1.2.1=h5eee18b_0 - dbus=1.13.18=hb2f20db_0 - - django=4.1=py38h06a4308_0 - - expat=2.6.2=h6a678d5_0 - - ffmpeg=4.3=hf484d3e_0 - - filelock=3.13.1=py38h06a4308_0 - - fontconfig=2.14.1=h4c34cd2_2 - - fonttools=4.51.0=py38h5eee18b_0 + - django=5.1=py310h06a4308_0 + - eigen=3.4.0=hdb19cb5_0 + - expat=2.6.3=h6a678d5_0 + - ffmpeg=4.2.2=h20bf706_0 + - filelock=3.13.1=py310h06a4308_0 + - fontconfig=2.14.1=h55d465d_3 - freetype=2.12.1=h4a9f257_0 - - frozenlist=1.4.0=py38h5eee18b_0 - - giflib=5.2.1=h5eee18b_3 - glib=2.78.4=h6a678d5_0 - glib-tools=2.78.4=h6a678d5_0 - gmp=6.2.1=h295c915_3 - - gmpy2=2.1.2=py38heeb90bb_0 + - gmpy2=2.1.2=py310heeb90bb_0 - gnutls=3.6.15=he1e5248_0 - - google-auth=2.22.0=py38h06a4308_0 - - google-auth-oauthlib=0.5.2=py38h06a4308_0 - - grpc-cpp=1.48.2=he1ff14a_4 - - grpcio=1.48.2=py38he1ff14a_4 + - graphite2=1.3.14=h295c915_1 + - grpcio=1.62.2=py310h6a678d5_0 - gst-plugins-base=1.14.1=h6a678d5_1 - gstreamer=1.14.1=h5eee18b_1 - - gtest=1.14.0=hdb19cb5_0 + - harfbuzz=4.3.0=hf52aaf7_2 + - hdf5=1.12.1=h2b7332f_3 - icu=73.1=h6a678d5_0 - - idna=3.4=py38h06a4308_0 - - imagecodecs=2023.1.23=py38hc4b7b5f_0 - - importlib-metadata=7.0.1=py38h06a4308_0 - - importlib_resources=6.4.0=py38h06a4308_0 + - idna=3.7=py310h06a4308_0 - intel-openmp=2023.1.0=hdb19cb5_46306 - - jinja2=3.1.2=py38h06a4308_0 - - jpeg=9e=h5eee18b_1 - - jxrlib=1.1=h7b6447c_2 - - kiwisolver=1.4.4=py38h6a678d5_0 + - jinja2=3.1.4=py310h06a4308_0 + - jpeg=9e=h5eee18b_3 - krb5=1.20.1=h143b758_1 - lame=3.100=h7b6447c_0 - lcms2=2.12=h3be6417_0 - ld_impl_linux-64=2.38=h1181459_1 - lerc=3.0=h295c915_0 - - libaec=1.0.4=he6710b0_1 - - libavif=0.11.1=h5eee18b_0 - - libbrotlicommon=1.0.9=h5eee18b_7 - - libbrotlidec=1.0.9=h5eee18b_7 - - libbrotlienc=1.0.9=h5eee18b_7 + - libabseil=20240116.2=cxx17_h6a678d5_0 - libclang=14.0.6=default_hc6dbbc7_1 - libclang13=14.0.6=default_he11475f_1 - libcublas=11.11.3.6=0 - libcufft=10.9.0.58=0 - - libcufile=1.8.1.2=0 + - libcufile=1.11.1.6=0 - libcups=2.4.2=h2d74bed_1 - - libcurand=10.3.4.107=0 - - libcurl=8.5.0=h251f7ec_0 + - libcurand=10.3.7.68=0 + - libcurl=8.9.1=h251f7ec_0 - libcusolver=11.4.1.48=0 - libcusparse=11.7.5.86=0 - libdeflate=1.17=h5eee18b_1 - libedit=3.1.20230828=h5eee18b_0 - libev=4.33=h7f8727e_1 - - libffi=3.4.4=h6a678d5_0 + - libffi=3.4.4=h6a678d5_1 - libgcc-ng=11.2.0=h1234567_1 - libgfortran-ng=11.2.0=h00389a5_1 - libgfortran5=11.2.0=h1234567_1 - libglib=2.78.4=hdc74915_0 - libgomp=11.2.0=h1234567_1 - - libiconv=1.16=h7f8727e_2 + - libgrpc=1.62.2=h2d74bed_0 + - libiconv=1.16=h5eee18b_3 - libidn2=2.3.4=h5eee18b_0 - libjpeg-turbo=2.0.0=h9bf148f_0 - - libllvm14=14.0.6=hdb19cb5_3 + - libllvm14=14.0.6=hecde1de_4 - libnghttp2=1.57.0=h2d74bed_0 - libnpp=11.8.0.86=0 - - libnvjitlink=12.1.105=0 - libnvjpeg=11.9.0.86=0 + - libopus=1.3.1=h7b6447c_0 - libpng=1.6.39=h5eee18b_0 - libpq=12.17=hdbd6064_0 - - libprotobuf=3.20.3=he621ea3_0 - - libssh2=1.10.0=hdbd6064_2 + - libprotobuf=4.25.3=he621ea3_0 + - libssh2=1.11.0=h251f7ec_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=1.3.2=h11a3e52_0 + - libvpx=1.7.0=h439df22_0 - libwebp-base=1.3.2=h5eee18b_0 - libxcb=1.15=h7f8727e_0 - - libxkbcommon=1.0.1=h5eee18b_1 - - libxml2=2.10.4=hf1b16e4_1 - - libzopfli=1.0.3=he6710b0_0 + - libxkbcommon=1.0.1=h097e994_2 + - libxml2=2.13.1=hfdd30dd_2 - llvm-openmp=14.0.6=h9e868ea_0 - - lz4-c=1.9.4=h6a678d5_0 - - markdown=3.4.1=py38h06a4308_0 - - markupsafe=2.1.3=py38h5eee18b_0 - - matplotlib=3.7.2=py38h06a4308_0 - - matplotlib-base=3.7.2=py38h1128e8f_0 + - lz4-c=1.9.4=h6a678d5_1 + - markdown=3.4.1=py310h06a4308_0 + - markupsafe=2.1.3=py310h5eee18b_0 - mkl=2023.1.0=h213fc3f_46344 - - mkl-service=2.4.0=py38h5eee18b_1 - - mkl_fft=1.3.8=py38h5eee18b_0 - - mkl_random=1.2.4=py38hdb19cb5_0 + - mkl-service=2.4.0=py310h5eee18b_1 + - mkl_fft=1.3.10=py310h5eee18b_0 + - mkl_random=1.2.7=py310h1128e8f_0 - mpc=1.1.0=h10f8cd9_1 - mpfr=4.0.2=hb69a4c5_1 - - mpmath=1.3.0=py38h06a4308_0 - - multidict=6.0.4=py38h5eee18b_0 + - mpmath=1.3.0=py310h06a4308_0 - mysql=5.7.24=h721c034_2 - ncurses=6.4=h6a678d5_0 - nettle=3.7.3=hbbd107a_1 - - networkx=3.1=py38h06a4308_0 - - numexpr=2.8.4=py38hc78ab66_1 - - numpy=1.24.3=py38hf6e8229_1 - - numpy-base=1.24.3=py38h060ed82_1 - - oauthlib=3.2.2=py38h06a4308_0 + - networkx=3.2.1=py310h06a4308_0 + - numpy=1.26.4=py310h5f9d8c6_0 + - numpy-base=1.26.4=py310hb5e798b_0 + - opencv=4.10.0=py310h0a8ef67_0 - openh264=2.1.1=h4ff587b_0 - - openjpeg=2.4.0=h3ad879b_0 + - openjpeg=2.5.2=he7f1fd0_0 - openssl=3.0.15=h5eee18b_0 - - packaging=23.2=py38h06a4308_0 - - pandas=2.0.3=py38h1128e8f_0 - pcre2=10.42=hebb0a14_1 - - pillow=10.0.1=py38ha6cbd5a_0 - - pip=23.3.1=py38h06a4308_0 - - ply=3.11=py38_0 - - protobuf=3.20.3=py38h6a678d5_0 - - pyasn1=0.4.8=pyhd3eb1b0_0 - - pyasn1-modules=0.2.8=py_0 - - pycparser=2.21=pyhd3eb1b0_0 - - pyjwt=2.4.0=py38h06a4308_0 - - pyopenssl=23.2.0=py38h06a4308_0 - - pyparsing=3.0.9=py38h06a4308_0 - - pyqt=5.15.10=py38h6a678d5_0 - - pyqt5-sip=12.13.0=py38h5eee18b_0 - - pysocks=1.7.1=py38h06a4308_0 - - python=3.8.18=h955ad1f_0 - - python-dateutil=2.8.2=pyhd3eb1b0_0 - - python-tzdata=2023.3=pyhd3eb1b0_0 - - pytorch=2.3.1=py3.8_cuda11.8_cudnn8.7.0_0 + - pillow=10.4.0=py310h5eee18b_0 + - pip=24.2=py310h06a4308_0 + - pixman=0.40.0=h7f8727e_1 + - protobuf=4.25.3=py310h12ddb61_0 + - pysocks=1.7.1=py310h06a4308_0 + - python=3.10.14=h955ad1f_1 + - pytorch=2.4.1=py3.10_cuda11.8_cudnn9.1.0_0 - pytorch-cuda=11.8=h7e8668a_5 - pytorch-mutex=1.0=cuda - - pytz=2023.3.post1=py38h06a4308_0 - - pyyaml=6.0.1=py38h5eee18b_0 + - pyyaml=6.0.1=py310h5eee18b_0 - qt-main=5.15.2=h53bd1ea_10 - re2=2022.04.01=h295c915_0 - readline=8.2=h5eee18b_0 - - requests=2.31.0=py38h06a4308_0 - - requests-oauthlib=1.3.0=py_0 - - rsa=4.7.2=pyhd3eb1b0_1 - - setuptools=68.2.2=py38h06a4308_0 - - sip=6.7.12=py38h6a678d5_0 + - requests=2.32.3=py310h06a4308_0 + - setuptools=75.1.0=py310h06a4308_0 - six=1.16.0=pyhd3eb1b0_1 - - snappy=1.1.10=h6a678d5_1 - - sqlite=3.41.2=h5eee18b_0 - - sqlparse=0.4.4=py38h06a4308_0 - - sympy=1.12=py38h06a4308_0 + - sqlite=3.45.3=h5eee18b_0 + - sqlparse=0.4.4=py310h06a4308_0 + - sympy=1.13.2=py310h06a4308_0 - tbb=2021.8.0=hdb19cb5_0 - - tensorboard=2.12.1=py38h06a4308_0 - - tensorboard-data-server=0.7.0=py38h52d8a92_0 - - tensorboard-plugin-wit=1.8.1=py38h06a4308_0 - - tifffile=2023.4.12=py38h06a4308_0 - - tk=8.6.12=h1ccaba5_0 - - tomli=2.0.1=py38h06a4308_0 - - torchaudio=2.3.1=py38_cu118 - - torchtriton=2.3.1=py38 - - torchvision=0.18.1=py38_cu118 - - tornado=6.4.1=py38h5eee18b_0 - - typing_extensions=4.9.0=py38h06a4308_0 + - tensorboard=2.17.0=py310h06a4308_0 + - tensorboard-data-server=0.7.0=py310h52d8a92_1 + - tk=8.6.14=h39e8969_0 + - torchaudio=2.4.1=py310_cu118 + - torchtriton=3.0.0=py310 + - torchvision=0.19.1=py310_cu118 + - typing_extensions=4.11.0=py310h06a4308_0 - tzdata=2024a=h04d1e81_0 - - unicodedata2=15.1.0=py38h5eee18b_0 - - urllib3=1.26.18=py38h06a4308_0 - - werkzeug=2.2.3=py38h06a4308_0 - - wheel=0.41.2=py38h06a4308_0 - - xz=5.4.5=h5eee18b_0 + - urllib3=2.2.2=py310h06a4308_0 + - werkzeug=3.0.3=py310h06a4308_0 + - wheel=0.44.0=py310h06a4308_0 + - x264=1!157.20191217=h7b6447c_0 + - xz=5.4.6=h5eee18b_1 - yaml=0.2.5=h7b6447c_0 - - yarl=1.9.3=py38h5eee18b_0 - - zfp=1.0.0=h6a678d5_0 - - zipp=3.17.0=py38h06a4308_0 - - zlib=1.2.13=h5eee18b_0 - - zstd=1.5.5=hc292b87_0 - - pip: -# - apex==0.1 - - argparse==1.4.0 - - automat==22.10.0 - - buildtools==1.0.6 -# - causal-conv1d==1.2.2.post1 -# - constantly==23.10.4 - - dinov2==0.0.1 - - docopt==0.6.2 - - einops==0.8.0 - - fsspec==2024.3.1 - - furl==2.1.3 - - ganet==0.0.0 - - greenlet==3.0.3 - - huggingface-hub==0.23.0 - - hyperlink==21.0.0 - - incremental==22.10.0 -# - jackframework==0.1.1 - - mamba-ssm==2.0.3 - - ninja==1.11.1.1 - - nvidia-cublas-cu11==11.11.3.6 - - nvidia-cuda-cupti-cu11==11.8.87 - - nvidia-cuda-nvrtc-cu11==11.8.89 - - nvidia-cuda-runtime-cu11==11.8.89 - - nvidia-cudnn-cu11==8.7.0.84 - - nvidia-cufft-cu11==10.9.0.58 - - nvidia-curand-cu11==10.3.0.86 - - nvidia-cusolver-cu11==11.4.1.48 - - nvidia-cusparse-cu11==11.7.5.86 - - nvidia-nccl-cu11==2.20.5 - - nvidia-nvtx-cu11==11.8.86 - - opencv-python==4.9.0.80 - - orderedmultidict==1.0.1 - - redo==2.0.4 - - regex==2024.4.28 - - safetensors==0.4.3 - - simplejson==3.19.2 - - sqlalchemy==2.0.29 - - timm==0.9.16 - - tokenizers==0.19.1 - - torch==2.3.0+cu118 - - torchsummary==1.5.1 - - tqdm==4.66.4 - - transformers==4.40.1 - - triton==2.3.0 - - twisted==24.3.0 - - xformers==0.0.26.post1+cu118 - - zope-interface==6.3 \ No newline at end of file + - zlib=1.2.13=h5eee18b_1 + - zstd=1.5.5=hc292b87_2 \ No newline at end of file diff --git a/meta.yaml b/meta.yaml index 72bde7c..e87b0bd 100644 --- a/meta.yaml +++ b/meta.yaml @@ -24,6 +24,7 @@ - pillow >=8.0.1 - opencv - tensorboard >=2.10.0 + - django test: imports: