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.

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

Update readme and vsn for 0.8.0 #8600

Merged
merged 8 commits into from
Jul 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/actions/whl/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ inputs:
default: "10.2"
python_version:
description: "python_version"
default: "3.6"
default: "3.8"
extra_flags:
description: "flags like --xla"
default: ""
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/canary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ jobs:
retry-failed-build: true
clean-ccache: true
python-versions: |
3.6
3.7
3.8
- name: Upload wheelhouse
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ jobs:
clean-ccache: true
nightly: ${{ github.event_name == 'schedule' }}
python-versions: |
3.6
3.7
3.8
3.9
Expand All @@ -117,7 +116,6 @@ jobs:
clean-ccache: false
nightly: ${{ github.event_name == 'schedule' || github.ref == 'refs/heads/master'}}
python-versions: |
3.6
3.7
3.8
3.9
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -268,8 +268,8 @@ jobs:
retry-failed-build: true
clean-ccache: ${{ contains(github.event.pull_request.labels.*.name, 'need-clean-ccache') }}
python-versions: |
3.6
3.7
3.8
- uses: Oneflow-Inc/get-oneflow@support-iree-ci
name: Build manylinux ${{ matrix.entry }}
id: build-cuda
Expand Down
12 changes: 4 additions & 8 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Changelog for OneFlow v0.8.0
# Changelog for OneFlow v0.8.1

## v0.8.0-dev
## v0.8.1-dev

### 1. Enhancements

Expand All @@ -18,10 +18,6 @@

#### Placeholder

### 3. Deprecations
## v0.8.0

#### Single client

## v0.7.0

The CHANGELOG for v0.7.0 releases can be found [in the v0.7.0 tag](https://github.com/Oneflow-Inc/oneflow/releases/tag/v0.7.0).
The CHANGELOG for v0.8.0 releases can be found [in the v0.8.0 tag](https://github.com/Oneflow-Inc/oneflow/releases/tag/v0.8.0).
37 changes: 35 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON CACHE BOOL "")

option(THIRD_PARTY "Build third party" ON)
option(ONEFLOW "Build oneflow" ON)

if(NOT THIRD_PARTY AND NOT ONEFLOW)
message(FATAL_ERROR "at least one of flags THIRD_PARTY and ONEFLOW should be ON")
endif()

option(USE_CLANG_FORMAT "" OFF)
option(USE_CLANG_TIDY "" OFF)
option(BUILD_PYTHON "" ON)
Expand All @@ -28,16 +30,19 @@ option(OF_SOFTMAX_USE_FAST_MATH "" ON)
option(OF_LAYER_NORM_USE_FAST_MATH "" ON)
option(TREAT_WARNINGS_AS_ERRORS "" ON)
option(MAYBE_NEED_ERROR_MSG_CHECK "" OFF)

# Reference:
# https://medium.com/@alasher/colored-c-compiler-output-with-ninja-clang-gcc-10bfe7f2b949
option(OF_FORCE_COLORED_DIAGNOSTICS "Always produce ANSI-colored diagnostics (GNU/Clang only)." ON)

set(ONEFLOW_CURRENT_VERSION 0.7.0.dev CACHE STRING "")
set(ONEFLOW_CURRENT_VERSION 0.8.1.dev CACHE STRING "")

if(BUILD_FOR_CI)
set(ONEFLOW_CURRENT_VERSION ci)
endif()

set(LLVM_PROVIDER "in-tree" CACHE STRING "in-tree, install")

if(NOT WITH_MLIR)
set(LLVM_PROVIDER "install"
CACHE STRING "in-tree will build LLVM's ALL, not what we want when not building MLIR" FORCE)
Expand Down Expand Up @@ -70,13 +75,16 @@ if(NOT CMAKE_BUILD_TYPE MATCHES "^(Debug|Release|RelWithDebInfo|MinSizeRel)$")
"Expected CMAKE_BUILD_TYPE is Debug, Release, RelWithDebInfo or MinSizeRel, got ${CMAKE_BUILD_TYPE}"
)
endif()

message(STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")

set(COMPILER_VERSION_ERROR_MSG "At least gcc 7, clang 5 or Apple clang 12 is supported.")

if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
if("${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS 7)
message(FATAL_ERROR ${COMPILER_VERSION_ERROR_MSG})
endif()

if(CPU_THREADING_RUNTIME STREQUAL "OMP")
set(OMP_FLAGS "-fopenmp")
endif()
Expand All @@ -91,6 +99,7 @@ elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
)
endif()
endif()

if("${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS 5)
message(FATAL_ERROR ${COMPILER_VERSION_ERROR_MSG})
endif()
Expand All @@ -106,6 +115,7 @@ set(oneflow_cmake_dir ${PROJECT_SOURCE_DIR}/cmake)

get_filename_component(real_src_dir "${CMAKE_SOURCE_DIR}" REALPATH)
get_filename_component(real_bin_dir "${CMAKE_BINARY_DIR}" REALPATH)

if("${real_src_dir}" STREQUAL "${real_bin_dir}")
message(FATAL_ERROR "In-source build not allowed")
endif()
Expand All @@ -121,32 +131,40 @@ if(NOT DEFINED USE_CXX11_ABI)
set(USE_CXX11_ABI ${CXX11_ABI_AVAILABLE})
elseif(USE_CXX11_ABI)
check_cxx11_abi(CXX11_ABI_AVAILABLE)

if(NOT CXX11_ABI_AVAILABLE)
message(FATAL_ERROR "cxx11 abi is not available for current compiler")
endif()
endif()

message(STATUS "USE_CXX11_ABI: ${USE_CXX11_ABI}")

if(WITH_MLIR)
add_definitions(-DWITH_MLIR)

if(WITH_MLIR_CUDA_CODEGEN)
add_definitions(-DWITH_MLIR_CUDA_CODEGEN)
endif()
endif()

if(WITH_COCOAPI)
add_definitions(-DWITH_COCOAPI)
endif()

if(USE_CXX11_ABI)
add_definitions(-D_GLIBCXX_USE_CXX11_ABI=1)
else()
add_definitions(-D_GLIBCXX_USE_CXX11_ABI=0)
endif()

if(BUILD_PROFILER)
add_definitions(-DOF_ENABLE_PROFILER)
endif()

if(OF_SOFTMAX_USE_FAST_MATH)
add_definitions(-DOF_SOFTMAX_USE_FAST_MATH)
endif()

if(OF_LAYER_NORM_USE_FAST_MATH)
add_definitions(-DOF_LAYER_NORM_USE_FAST_MATH)
endif()
Expand All @@ -167,14 +185,17 @@ if(OF_FORCE_COLORED_DIAGNOSTICS)
$<$<COMPILE_LANGUAGE:CXX>:$<$<CXX_COMPILER_ID:Clang>:-fcolor-diagnostics>>
$<$<COMPILE_LANGUAGE:CUDA>:$<$<CUDA_COMPILER_ID:Clang>:-fcolor-diagnostics>>)
endif()

if(RPC_BACKEND MATCHES "GRPC")
add_definitions(-DRPC_BACKEND_GRPC)
message(STATUS "RPC backend enabled: gRPC")
set(SUPPORTED_RPC_BACKEND_FOUND 1)
endif()

if(WITH_ONEDNN)
add_definitions(-DWITH_ONEDNN)
endif()

add_definitions(-DRPC_BACKEND_LOCAL)
message(STATUS "RPC backend enabled: local")
enable_testing()
Expand Down Expand Up @@ -225,13 +246,15 @@ if(WIN32)
endif()
endforeach()

#set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS} /DEBUG:FASTLINK")
# set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS} /DEBUG:FASTLINK")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /D_ITERATOR_DEBUG_LEVEL=0")
else()
set(EXTRA_CXX_FLAGS "-std=c++14 -Wall -Wno-sign-compare -Wno-unused-function -fPIC")

if(APPLE)
set(EXTRA_CXX_FLAGS "${EXTRA_CXX_FLAGS} -Wno-deprecated-declarations")
endif()

set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CXX_FLAGS}")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${EXTRA_CXX_FLAGS}")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${EXTRA_CXX_FLAGS}")
Expand Down Expand Up @@ -271,22 +294,28 @@ if(BUILD_CUDA)
# NOTE: if you want to use source PTX with a version different from produced PTX/binary, you should add flags
if(NOT DEFINED CMAKE_CUDA_ARCHITECTURES)
list(APPEND CMAKE_CUDA_ARCHITECTURES 60-real)

# Tesla P40/P4, Quadro Pxxx/Pxxxx, GeForce GTX 10xx, TITAN X/Xp
list(APPEND CMAKE_CUDA_ARCHITECTURES 61-real)

# V100, TITAN V
list(APPEND CMAKE_CUDA_ARCHITECTURES 70-real)

if(CUDA_VERSION VERSION_GREATER_EQUAL "10.0")
# T4, Quadro RTX xxxx, Txxxx, Geforce RTX 20xx, TITAN RTX
list(APPEND CMAKE_CUDA_ARCHITECTURES 75-real)
endif()

if(CUDA_VERSION VERSION_GREATER_EQUAL "11.0")
# A100
list(APPEND CMAKE_CUDA_ARCHITECTURES 80-real)
endif()

if(CUDA_VERSION VERSION_GREATER_EQUAL "11.1")
# GeForce RTX 30xx
list(APPEND CMAKE_CUDA_ARCHITECTURES 86-real)
endif()

if(CUDA_VERSION VERSION_GREATER_EQUAL "11.0")
list(APPEND CMAKE_CUDA_ARCHITECTURES 80-virtual)
elseif(CUDA_VERSION VERSION_GREATER_EQUAL "10.0")
Expand All @@ -295,6 +324,7 @@ if(BUILD_CUDA)
list(APPEND CMAKE_CUDA_ARCHITECTURES 70-virtual)
endif()
endif()

enable_language(CUDA)
include_directories(${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES})
message(STATUS "CMAKE_CUDA_ARCHITECTURES: ${CMAKE_CUDA_ARCHITECTURES}")
Expand All @@ -305,6 +335,7 @@ if(BUILD_CUDA)
set(CUDA_NVCC_THREADS_NUMBER "4" CACHE STRING "")
list(APPEND CUDA_NVCC_FLAGS -t ${CUDA_NVCC_THREADS_NUMBER})
endif()

message(STATUS "CUDA_NVCC_FLAGS: " ${CUDA_NVCC_FLAGS})
list(JOIN CUDA_NVCC_FLAGS " " CMAKE_CUDA_FLAGS)
endif()
Expand All @@ -313,8 +344,10 @@ endif()
message(STATUS "CMAKE_CXX_COMPILER_VERSION: " ${CMAKE_CXX_COMPILER_VERSION})

add_custom_target(oneflow_deps ALL DEPENDS prepare_oneflow_third_party)

# skip oneflow cmake to avoid errors caused by the absences of python-dev, proto src
if(ONEFLOW)
include(oneflow)
endif()

add_subdirectory(ci)
12 changes: 5 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,8 @@

## Latest News

- Version 0.7.0 is out!
- Introducing global tensor
- Semi-auto parallelization has landed
- [Full changelog](https://github.com/Oneflow-Inc/oneflow/releases/tag/v0.7.0)
- Version 0.8.0 is out!
- [Full changelog](https://github.com/Oneflow-Inc/oneflow/releases/tag/v0.8.0)

## Publication

Expand All @@ -35,7 +33,7 @@
### System Requirements

- Linux. As for now, there is no pre-built release for macOS, Windows.
- Python 3.6, 3.7, 3.8, 3.9, 3.10
- Python 3.7, 3.8, 3.9, 3.10
- (**Highly recommended**) Upgrade pip

```
Expand All @@ -53,7 +51,7 @@
- To install latest stable release of OneFlow with CUDA support:

```bash
python3 -m pip install -f https://release.oneflow.info oneflow==0.7.0+cu102
python3 -m pip install oneflow
```

- To install nightly release of OneFlow with CUDA support:
Expand All @@ -66,7 +64,7 @@

- Stable
```bash
python3 -m pip install --find-links https://release.oneflow.info oneflow==0.7.0+[PLATFORM]
python3 -m pip install --find-links https://release.oneflow.info oneflow==0.8.0+[PLATFORM]
```
- Nightly
```
Expand Down
2 changes: 1 addition & 1 deletion tools/generate_pip_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
args = parser.parse_args()

local_label = ""
version = f"0.8.0"
version = f"0.8.1"

# set version if release of nightly
assert (
Expand Down