Skip to content
Snippets Groups Projects
Commit bc25900d authored by Amir MOHAMMADI's avatar Amir MOHAMMADI
Browse files

Merge branch 'torch_cpu' into 'master'

[bob-devel] Use cudatoolkit 9.0 pytorch variant which works on CPU

See merge request bob/bob.conda!414
parents cbeab452 857c99e1
Branches
No related tags found
1 merge request!414[bob-devel] Use cudatoolkit 9.0 pytorch variant which works on CPU
Pipeline #29778 passed
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
{% set nopin = ['ca-certificates', 'certifi', 'openssl', 'libstdcxx-ng', 'libgcc-ng', 'libcxx', 'libcxxabi'] %} {% set nopin = ['ca-certificates', 'certifi', 'openssl', 'libstdcxx-ng', 'libgcc-ng', 'libcxx', 'libcxxabi'] %}
package: package:
name: beat-devel name: beat-devel
version: 2019.04.18 version: 2019.04.30
build: build:
# the build number must be zero all the time. # the build number must be zero all the time.
...@@ -15,7 +15,7 @@ build: ...@@ -15,7 +15,7 @@ build:
requirements: requirements:
host: host:
- python {{ python }} - python {{ python }}
- bob-devel 2019.04.18 - bob-devel 2019.04.30
- docker-py 3.6.0 - docker-py 3.6.0
- flask 1.0.2 - flask 1.0.2
- flask-cors 3.0.7 - flask-cors 3.0.7
......
...@@ -4,7 +4,7 @@ package: ...@@ -4,7 +4,7 @@ package:
name: bob-devel name: bob-devel
# please update the version of beat-devel and update bob-devel's version there # please update the version of beat-devel and update bob-devel's version there
# as well in the same merge request. # as well in the same merge request.
version: 2019.04.18 version: 2019.04.30
build: build:
# the build number must be zero all the time. # the build number must be zero all the time.
...@@ -53,6 +53,7 @@ requirements: ...@@ -53,6 +53,7 @@ requirements:
- pillow 5.4.1 - pillow 5.4.1
- pkg-config 0.29.2 - pkg-config 0.29.2
- pyedflib 0.1.11 - pyedflib 0.1.11
- cudatoolkit 9.0 # [linux]
- pytorch 1.0.1 # [linux] - pytorch 1.0.1 # [linux]
- pyyaml 5.1 - pyyaml 5.1
- requests 2.21.0 - requests 2.21.0
...@@ -87,8 +88,11 @@ requirements: ...@@ -87,8 +88,11 @@ requirements:
{% endfor %} {% endfor %}
test: test:
imports:
- torch # [linux]
requires: requires:
- ffmpeg - ffmpeg
- pytorch # [linux]
commands: commands:
# we expect these features from ffmpeg: # we expect these features from ffmpeg:
- ffmpeg -codecs | grep "DEVI.S zlib" # [unix] - ffmpeg -codecs | grep "DEVI.S zlib" # [unix]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment