Skip to content

Commit b758984

Browse files
authored
Merge pull request #87 from CortexFoundation/dev
Merge dev to master
2 parents 82917ec + 1d957de commit b758984

File tree

162 files changed

+18391
-1677
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

162 files changed

+18391
-1677
lines changed

.github/workflows/ccpp.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: C/C++ CI
2+
3+
on:
4+
push:
5+
branches: [ master ]
6+
pull_request:
7+
branches: [ master ]
8+
9+
jobs:
10+
build:
11+
12+
runs-on: ubuntu-latest
13+
14+
steps:
15+
- uses: actions/checkout@v2
16+
- name: configure
17+
run: ./configure
18+
- name: make
19+
run: make
20+
- name: make check
21+
run: make check
22+
- name: make distcheck
23+
run: make distcheck

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,3 +54,4 @@ out/*
5454
# docs
5555
docs/html
5656
docs/doctrees
57+
docs/doxygen_output

.readthedocs.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@ sphinx:
1313
#mkdocs:
1414
# configuration: mkdocs.yml
1515

16-
# Optionally build your docs in additional formats such as PDF
17-
formats:
18-
- pdf
19-
2016
# Optionally set the version of Python and requirements required to build your docs
2117
python:
2218
version: 3.7

CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cmake_minimum_required(VERSION 3.2)
22
project(cvm C CXX)
33

4-
set(CMAKE_EXPORT_COMPILE_COMMANDS ON )
4+
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
55

66
# Utility functions
77
include(cmake/util/Util.cmake)
@@ -78,6 +78,7 @@ if(ENABLE_CUDA)
7878
list(APPEND CVM_RUNTIME_LINKER_LIBS ${CUDA_NVRTC_LIBRARY})
7979

8080
set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} --expt-extended-lambda)
81+
# set(CMAKE_CUDA_FLAGS ${CMAKE_CUDA_FLAGS} --expt-extended-lambda)
8182

8283
add_definitions(-DCVM_RUNTIME_CUDA)
8384
if(USE_NANO)

Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ dep:
1616
lib: dep
1717
@cd ${BUILD} && cmake ../ && $(MAKE)
1818

19+
# Make sure install the python dependency package before
20+
# make python target.
1921
python: lib
2022
@cd python && python3 setup.py install
2123

0 commit comments

Comments
 (0)