Skip to content

Commit 4d00097

Browse files
authored
Merge pull request #97 from CortexFoundation/dev
Merge dev: update mrt v3.
2 parents b758984 + 7908f38 commit 4d00097

File tree

254 files changed

+14466
-332
lines changed

Some content is hidden

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

254 files changed

+14466
-332
lines changed

.github/workflows/ccpp.yml

Lines changed: 0 additions & 23 deletions
This file was deleted.

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,6 @@ out/*
5555
docs/html
5656
docs/doctrees
5757
docs/doxygen_output
58+
59+
# django
60+
python/mrt/web/db.sqlite3

.readthedocs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ sphinx:
1717
python:
1818
version: 3.7
1919
install:
20-
- requirements: install/requirements.txt
20+
- requirements: conf/requirements.txt
2121
- requirements: docs/requirements.txt
2222
system_packages: true

.ycm_extra_conf.py

Lines changed: 0 additions & 94 deletions
This file was deleted.

Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ all: lib python tests html
1111

1212
# Mac OS should install libomp with brew
1313
dep:
14-
python3 install/deps.py
14+
python3 conf/deps.py
1515

1616
lib: dep
1717
@cd ${BUILD} && cmake ../ && $(MAKE)
@@ -39,6 +39,9 @@ test_gpu: ${TEST_GPUS}
3939
test_formal: ${TEST_FORMALS}
4040
test_opencl: ${TEST_OPENCL}
4141

42+
%: %_cpu %_gpu %_formal
43+
@echo "compile $@ succeed"
44+
4245
%_cpu: ${TESTS}/%.cc lib
4346
g++ -o ${BUILD}/${TESTS}/$@ $< -DDEVICE=0 -std=c++11 -I${INCLUDE} -L${BUILD} -lcvm -fopenmp -fsigned-char -pthread -Wl,-rpath=${BUILD}
4447

File renamed without changes.

conf/env.sh

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
CURR_DIR=$(dirname $(realpath ${BASH_SOURCE[0]}))
2+
ROOT_DIR=$(dirname ${CURR_DIR})
3+
PROJECT_NAME=$(basename ${ROOT_DIR})
4+
5+
COM=""
6+
7+
if [[ "${PYTHONPATH}" != *"${PROJECT_NAME}/python"* ]]; then
8+
TPATH=${ROOT_DIR}/python
9+
[[ -z ${PYTHONPATH} ]] || TPATH=${TPATH}:${PYTHONPATH}
10+
export PYTHONPATH=${TPATH}
11+
fi
12+
13+
if [[ "${LD_LIBRARY_PATH}" != *"${PROJECT_NAME}/build"* ]]; then
14+
TPATH=${ROOT_DIR}/build
15+
[[ -z ${LD_LIBRARY_PATH} ]] || TPATH=${TPATH}:${LD_LIBRARY_PATH}
16+
export LD_LIBRARY_PATH=${TPATH}
17+
fi
18+
19+
# if [[ ${COM} != "" ]]; then
20+
# cat <<EOF
21+
22+
# Due to bash limitation, we cannot add python & link library
23+
# environment via scripts, and then we supply the below commands to
24+
# help to setup the project, copy and execute it in terminal please:
25+
26+
# \`
27+
# ${COM}
28+
# \`
29+
30+
# EOF
31+
# fi
32+
33+
# echo "Done."
34+
35+
# compile the cython module
36+
# echo "Compile the cython setup"
37+
# cd python
38+
# python3 setup.py build_ext -i
39+
# cd ..
File renamed without changes.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
numpy
22
cython
33
decorator
4+
yacs

docs/assets/V3.png

175 KB
Loading

0 commit comments

Comments
 (0)