Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update default python version to 3.8 in documents and makefiles #450

Merged
merged 2 commits into from
Jan 13, 2023
Merged

Update default python version to 3.8 in documents and makefiles #450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a9d7c1
set default python version to 3.8
Qizhen-Xue Dec 23, 2022
226c9e8
update python version
Qizhen-Xue Jan 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build-tools/make/options.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ ifndef NNABLA_EXT_CUDA_OPTIONS_INCLUDED

NNABLA_EXT_CUDA_OPTIONS_INCLUDED = True

export CUDA_VERSION_MAJOR ?= 10
export CUDA_VERSION_MAJOR ?= 11
DOCKER_RUN_OPTS += -e CUDA_VERSION_MAJOR=$(CUDA_VERSION_MAJOR)

export CUDA_VERSION_MINOR ?= 2
export CUDA_VERSION_MINOR ?= 0
DOCKER_RUN_OPTS += -e CUDA_VERSION_MINOR=$(CUDA_VERSION_MINOR)

export CUDNN_VERSION ?= 8
Expand Down
2 changes: 1 addition & 1 deletion build-tools/msvc/build_cpplib.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ REM
SETLOCAL

REM Environment
CALL %~dp0tools\env.bat 3.7 %1 %2 || GOTO :error
CALL %~dp0tools\env.bat 3.8 %1 %2 || GOTO :error

IF NOT EXIST %nnabla_build_folder% (
ECHO nnabla_build_folder ^(%nnabla_build_folder%^) does not exist.
Expand Down
12 changes: 4 additions & 8 deletions docker/development/Dockerfile.build-mpi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
# limitations under the License.


ARG CUDA_VERSION_MAJOR=10
ARG CUDA_VERSION_MINOR=0
ARG CUDNN_VERSION=7
ARG CUDA_VERSION_MAJOR=11
ARG CUDA_VERSION_MINOR=0.3
ARG CUDNN_VERSION=8

############################################################ OpenMPI
# CentOS7: 1.10.7-1 (12)
Expand Down Expand Up @@ -214,16 +214,12 @@ COPY --from=openmpi /root/openmpi-*.rpm /root
RUN rpm -i /root/openmpi-*.rpm

ARG PYTHON_VERSION_MAJOR=3
ARG PYTHON_VERSION_MINOR=7
ARG PYTHON_VERSION_MINOR=8
ENV PYVERNAME=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}

############################################################ build python from pyenv
ADD python/requirements.txt /tmp/deps/

ARG ARCH_SUFFIX
ARG CUDA_VERSION_MAJOR=11
ARG CUDA_VERSION_MINOR=0
ARG CUDNN_VERSION=8
RUN git clone https://github.com/pyenv/pyenv.git ~/.pyenv \
&& export PYENV_ROOT="$HOME/.pyenv" \
&& export PATH="$PYENV_ROOT/bin:$PYENV_ROOT/plugins/python-build/bin:$PATH" \
Expand Down
5 changes: 3 additions & 2 deletions python/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,9 +400,10 @@ def get_setup_config(root_dir):
'License :: OSI Approved :: Apache Software License',
'Programming Language :: C++',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: Implementation :: CPython',
'Operating System :: Microsoft :: Windows',
'Operating System :: POSIX :: Linux',
Expand Down