simcop2387/faceswap
1
0
Fork 0
mirror of https://github.com/deepfakes/faceswap synced 2025-06-07 10:43:27 -04:00
Code Issues Releases Wiki Activity

bugfixes:

Browse source 
- Remove duplicate line from Dockerfile.gpu
  - Add more robust Conda checking
This commit is contained in:
torzdf 2023-06-27 16:05:53 +01:00
parent 6a3b674bef
commit 4819d5b97d
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Dockerfile.gpu
View file

@ -12,7 +12,6 @@ RUN ln -s $(which python3) /usr/local/bin/python
RUN git clone --depth 1 --no-single-branch https://github.com/deepfakes/faceswap.git RUN git clone --depth 1 --no-single-branch https://github.com/deepfakes/faceswap.git
WORKDIR "/faceswap" WORKDIR "/faceswap"
RUN python -m pip install --upgrade pip
RUN python -m pip install --upgrade pip RUN python -m pip install --upgrade pip
RUN python -m pip --no-cache-dir install -r ./requirements/requirements_nvidia.txt RUN python -m pip --no-cache-dir install -r ./requirements/requirements_nvidia.txt

3
setup.py
View file

@ -101,7 +101,8 @@ class Environment():
def is_conda(self) -> bool: def is_conda(self) -> bool:
""" Check whether using Conda """ """ Check whether using Conda """
return ("conda" in sys.version.lower() or return ("conda" in sys.version.lower() or
os.path.exists(os.path.join(sys.prefix, 'conda-meta'))) os.path.exists(os.path.join(sys.prefix, 'conda-meta'))
or os.environ.get("CONDA_DEFAULT_ENV"))
@property @property
def is_admin(self) -> bool: def is_admin(self) -> bool: