Merge branch 'master' into gpu
Conflicts:
SConstruct
Description
Description
Details
Details
- Committed
frerot Oct 12 2017, 10:55 - Pushed
frerot Oct 12 2017, 12:48 - Parents
- rTAMAAS82094210e0a8: ensure correct dependencies (by copying source)
rTAMAAS820a350bce9e: added detection of cuda on clusters - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 82094210e0a8 | frerot | ensure correct dependencies (by copying source) | Oct 11 2017 | |||
| 43b209bb8954 | frerot | Merge branch 'master' of lsmssrv1.epfl.ch:tamaas | Oct 10 2017 | |||
| 64968f9156ef | anciaux | Merge branch 'master' of gitolite:tamaas | Oct 10 2017 | |||
| 644138f89dd8 | anciaux | making it python3 for print function | Oct 10 2017 | |||
| 1f7361fa6457 | anciaux | from future import | Oct 10 2017 |