Unverified Commit fe566a82 authored by Daiki Nishikawa's avatar Daiki Nishikawa Committed by GitHub
Browse files

Merge pull request #2096 from nd-02110114/update-version

Fix install scripts bug for MacOS
parents b41f5f4e af42403e
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ install:
  - hash -r
  - conda config --set always_yes yes --set changeps1 no
  - conda update -q conda
  - bash scripts/install_deepchem_conda.sh deepchem
  - bash scripts/install_deepchem_conda.sh cpu
  - conda activate deepchem
  - python setup.py install
script:
+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ RUN conda update -n base conda && \
    git clone --depth 1 https://github.com/deepchem/deepchem.git && \
    cd deepchem && \
    . /miniconda/etc/profile.d/conda.sh && \
    bash scripts/install_deepchem_conda.sh deepchem gpu && \
    bash scripts/install_deepchem_conda.sh gpu && \
    conda activate deepchem && \
    python setup.py install && \
    conda clean -afy && \
+0 −2
Original line number Diff line number Diff line
@@ -21,5 +21,3 @@ You can generate docs in other formats as well if you like. To clean up past bui
```
make clean
```

+4 −4
Original line number Diff line number Diff line
@@ -138,21 +138,21 @@ Then, execute the shell script.

.. code-block:: bash

    bash scripts/install_deepchem_conda.sh deepchem
    bash scripts/install_deepchem_conda.sh cpu


If you want GPU support:
If you want GPU support (we supports only CUDA 10.1):

.. code-block:: bash

    bash scripts/install_deepchem_conda.sh deepchem gpu
    bash scripts/install_deepchem_conda.sh gpu


If you are using the Windows and the PowerShell:

.. code-block:: ps1

    .\scripts\install_deepchem_conda.ps1 deepchem
    .\scripts\install_deepchem_conda.ps1 cpu


| Before activating deepchem environment, make sure conda has been initialized.
+6 −6
Original line number Diff line number Diff line
@@ -13,8 +13,8 @@ DeepChem currently supports Python 3.5 through 3.7 and requires these packages o
- `SciPy`_
- `TensorFlow`_

  - `deepchem>=2.4.0` requires tensorflow v2
  - `deepchem<2.4.0` requires tensorflow v1
  - `deepchem>=2.4.0` requires tensorflow v2 (2.2.0)
  - `deepchem<2.4.0` requires tensorflow v1 (>=1.14)


Soft requirements
@@ -30,7 +30,7 @@ DeepChem has a number of "soft" requirements.
|                                |               |                                                   |
|                                |               |                                                   |
+--------------------------------+---------------+---------------------------------------------------+
| `Deep Graph Library`_          | 0.4.3.post2   | :code:`dc.feat.graph_data`                        |
| `Deep Graph Library`_          | latset        | :code:`dc.feat.graph_data`                        |
|                                |               |                                                   |
|                                |               |                                                   |
+--------------------------------+---------------+---------------------------------------------------+
@@ -70,12 +70,12 @@ DeepChem has a number of "soft" requirements.
|                                |               |                                                   |
|                                |               |                                                   |
+--------------------------------+---------------+---------------------------------------------------+
| `PyTorch`_                     | 1.5.1         | :code:`dc.data.datasets`                          |
| `PyTorch`_                     | 1.6.0         | :code:`dc.data.datasets`                          |
|                                |               |                                                   |
|                                |               |                                                   |
+--------------------------------+---------------+---------------------------------------------------+
| `PyTorch Geometric`_           | 1.6.0         | :code:`dc.feat.graph_data`                        |
|                                |               |                                                   |
| `PyTorch Geometric`_           | latest (with  | :code:`dc.feat.graph_data`                        |
|                                | PyTorch 1.6.0)|                                                   |
|                                |               |                                                   |
+--------------------------------+---------------+---------------------------------------------------+
| `RDKit`_                       | latest        | Many modules                                      |
Loading