Skip to content

Commit db57478

Browse files
committed
Merge branch 'master' of github.com:rusty1s/pytorch_scatter
2 parents 9411016 + 37b125c commit db57478

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ before_install:
1818
- export CXX="g++-4.9"
1919
install:
2020
- if [[ $TRAVIS_PYTHON_VERSION == 2.7 ]]; then pip install http://download.pytorch.org/whl/cpu/torch-0.4.1-cp27-cp27mu-linux_x86_64.whl; fi
21-
- if [[ $TRAVIS_PYTHON_VERSION == 3.5 ]]; then pip install http://download.pytorch.org/whl/cpu/torch-0.4.1-cp35-cp35m-linux_x86_64.whl; fi
21+
- if [[ $TRAVIS_PYTHON_VERSION == 3.5 ]]; then pip install http://download.pytorch.org/whl/cpu/torch-0.4.1-cp35-cp35m-linux_x86_64.whl; fi
2222
- if [[ $TRAVIS_PYTHON_VERSION == 3.6 ]]; then pip install http://download.pytorch.org/whl/cpu/torch-0.4.1-cp36-cp36m-linux_x86_64.whl; fi
2323
- pip install pycodestyle
2424
- pip install flake8

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ All included operations work on varying data types, are implemented both for CPU
3535

3636
## Installation
3737

38-
Ensure that at least PyTorch 0.4.1 is installed and verify that `cuda/bin` and `cuda/install` are in your `$PATH` and `$CPATH` respectively, *e.g.*:
38+
Ensure that at least PyTorch 0.4.1 is installed and verify that `cuda/bin` and `cuda/include` are in your `$PATH` and `$CPATH` respectively, *e.g.*:
3939

4040
```
4141
$ python -c "import torch; print(torch.__version__)"
@@ -45,7 +45,7 @@ $ echo $PATH
4545
>>> /usr/local/cuda/bin:...
4646
4747
$ echo $CPATH
48-
>>> /usr/local/cuda/install:...
48+
>>> /usr/local/cuda/include:...
4949
```
5050

5151
Then run:

cuda/atomics.cuh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#pragma once
2+
13
#define ATOMIC(NAME) \
24
template <typename scalar, size_t size> struct Atomic##NAME##IntegerImpl; \
35
\

0 commit comments

Comments
 (0)