Skip to content

Commit 4eb4dd7

Browse files
zsdonghaoJonathan DEKHTIAR
authored andcommitted
Refactoring Markdown Files (#639)
* [WIP] rearrange readme and example list * Readme Updated * Error Fix * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update CONTRIBUTING.md * Update README.md * Update CONTRIBUTING.md * Update README.md * Update CHANGELOG.md * Changelog updated * Update README.md * Fixing Docker run commands * Deprecated Python 3.4 * New Alias for Docker Added * Update CONTRIBUTING.md * Update CONTRIBUTING.md * Update README.md * Update README.rst * Update README.rst * Update README.rst
1 parent c493ac2 commit 4eb4dd7

File tree

7 files changed

+336
-668
lines changed

7 files changed

+336
-668
lines changed

.circleci/config.yml

Lines changed: 49 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
docker build -t latest_py3_gpu python3/gpu
7272
7373
###################################################################################
74-
# MASTER BRANCH BUILDS with TensorLayer installed from Source #
74+
# NIGHTLY BUILDS from TensorLayer Master Branch installed from Source #
7575
###################################################################################
7676

7777
nightly_sources_py2_cpu:
@@ -114,6 +114,10 @@ jobs:
114114
docker tag latest_py2_cpu:latest tensorlayer/tensorlayer:"$CONTAINER_TAG"
115115
docker push tensorlayer/tensorlayer:"$CONTAINER_TAG"
116116
117+
CONTAINER_TAG="$VERSION_PREFIX"-py2-cpu
118+
docker tag latest_py2_cpu:latest tensorlayer/tensorlayer:"$CONTAINER_TAG"
119+
docker push tensorlayer/tensorlayer:"$CONTAINER_TAG"
120+
117121
nightly_sources_py2_gpu:
118122
working_directory: ~/build
119123
docker:
@@ -146,6 +150,10 @@ jobs:
146150
docker tag latest_py2_gpu:latest tensorlayer/tensorlayer:"$CONTAINER_TAG"
147151
docker push tensorlayer/tensorlayer:"$CONTAINER_TAG"
148152
153+
CONTAINER_TAG="$VERSION_PREFIX"-py2-gpu
154+
docker tag latest_py2_gpu:latest tensorlayer/tensorlayer:"$CONTAINER_TAG"
155+
docker push tensorlayer/tensorlayer:"$CONTAINER_TAG"
156+
149157
nightly_sources_py3_cpu:
150158
working_directory: ~/build
151159
docker:
@@ -178,6 +186,10 @@ jobs:
178186
docker tag latest_py3_cpu:latest tensorlayer/tensorlayer:"$CONTAINER_TAG"
179187
docker push tensorlayer/tensorlayer:"$CONTAINER_TAG"
180188
189+
CONTAINER_TAG="$VERSION_PREFIX"-py3-cpu
190+
docker tag latest_py3_cpu:latest tensorlayer/tensorlayer:"$CONTAINER_TAG"
191+
docker push tensorlayer/tensorlayer:"$CONTAINER_TAG"
192+
181193
nightly_sources_py3_gpu:
182194
working_directory: ~/build
183195
docker:
@@ -205,6 +217,10 @@ jobs:
205217
CONTAINER_TAG="$VERSION_PREFIX"-gpu-py3
206218
docker tag latest_py3_gpu:latest tensorlayer/tensorlayer:"$CONTAINER_TAG"
207219
docker push tensorlayer/tensorlayer:"$CONTAINER_TAG"
220+
221+
CONTAINER_TAG="$VERSION_PREFIX"-py3-gpu
222+
docker tag latest_py3_gpu:latest tensorlayer/tensorlayer:"$CONTAINER_TAG"
223+
docker push tensorlayer/tensorlayer:"$CONTAINER_TAG"
208224
209225
###################################################################################
210226
# TAGS BUILDS with TensorLayer installed from PyPI #
@@ -258,6 +274,10 @@ jobs:
258274
docker tag latest_py2_cpu:latest tensorlayer/tensorlayer:"$CONTAINER_TAG"
259275
docker push tensorlayer/tensorlayer:"$CONTAINER_TAG"
260276
277+
CONTAINER_TAG="$VERSION_PREFIX"-py2-cpu
278+
docker tag latest_py2_cpu:latest tensorlayer/tensorlayer:"$CONTAINER_TAG"
279+
docker push tensorlayer/tensorlayer:"$CONTAINER_TAG"
280+
261281
# ============== Tag Python2 CPU Containers ==============
262282
263283
CONTAINER_TAG="$TL_VERSION"
@@ -276,6 +296,10 @@ jobs:
276296
docker tag latest_py2_cpu:latest tensorlayer/tensorlayer:"$CONTAINER_TAG"
277297
docker push tensorlayer/tensorlayer:"$CONTAINER_TAG"
278298
299+
CONTAINER_TAG="$TL_VERSION"-py2-cpu
300+
docker tag latest_py2_cpu:latest tensorlayer/tensorlayer:"$CONTAINER_TAG"
301+
docker push tensorlayer/tensorlayer:"$CONTAINER_TAG"
302+
279303
build_pypi_py2_gpu:
280304
working_directory: ~/build
281305
docker:
@@ -316,6 +340,10 @@ jobs:
316340
docker tag latest_py2_gpu:latest tensorlayer/tensorlayer:"$CONTAINER_TAG"
317341
docker push tensorlayer/tensorlayer:"$CONTAINER_TAG"
318342
343+
CONTAINER_TAG="$VERSION_PREFIX"-py2-gpu
344+
docker tag latest_py2_gpu:latest tensorlayer/tensorlayer:"$CONTAINER_TAG"
345+
docker push tensorlayer/tensorlayer:"$CONTAINER_TAG"
346+
319347
# ============== Tag Python2 GPU Containers ==============
320348
321349
CONTAINER_TAG="$TL_VERSION"-gpu
@@ -326,6 +354,10 @@ jobs:
326354
docker tag latest_py2_gpu:latest tensorlayer/tensorlayer:"$CONTAINER_TAG"
327355
docker push tensorlayer/tensorlayer:"$CONTAINER_TAG"
328356
357+
CONTAINER_TAG="$TL_VERSION"-py2-gpu
358+
docker tag latest_py2_gpu:latest tensorlayer/tensorlayer:"$CONTAINER_TAG"
359+
docker push tensorlayer/tensorlayer:"$CONTAINER_TAG"
360+
329361
build_pypi_py3_cpu:
330362
working_directory: ~/build
331363
docker:
@@ -366,6 +398,10 @@ jobs:
366398
docker tag latest_py3_cpu:latest tensorlayer/tensorlayer:"$CONTAINER_TAG"
367399
docker push tensorlayer/tensorlayer:"$CONTAINER_TAG"
368400
401+
CONTAINER_TAG="$VERSION_PREFIX"-py3-cpu
402+
docker tag latest_py3_cpu:latest tensorlayer/tensorlayer:"$CONTAINER_TAG"
403+
docker push tensorlayer/tensorlayer:"$CONTAINER_TAG"
404+
369405
# ============== Tag Python3 CPU Containers ==============
370406
371407
CONTAINER_TAG="$TL_VERSION"-py3
@@ -375,6 +411,10 @@ jobs:
375411
CONTAINER_TAG="$TL_VERSION"-cpu-py3
376412
docker tag latest_py3_cpu:latest tensorlayer/tensorlayer:"$CONTAINER_TAG"
377413
docker push tensorlayer/tensorlayer:"$CONTAINER_TAG"
414+
415+
CONTAINER_TAG="$TL_VERSION"-py3-cpu
416+
docker tag latest_py3_cpu:latest tensorlayer/tensorlayer:"$CONTAINER_TAG"
417+
docker push tensorlayer/tensorlayer:"$CONTAINER_TAG"
378418
379419
build_pypi_py3_gpu:
380420
working_directory: ~/build
@@ -412,11 +452,19 @@ jobs:
412452
docker tag latest_py3_gpu:latest tensorlayer/tensorlayer:"$CONTAINER_TAG"
413453
docker push tensorlayer/tensorlayer:"$CONTAINER_TAG"
414454
455+
CONTAINER_TAG="$VERSION_PREFIX"-py3-gpu
456+
docker tag latest_py3_gpu:latest tensorlayer/tensorlayer:"$CONTAINER_TAG"
457+
docker push tensorlayer/tensorlayer:"$CONTAINER_TAG"
458+
415459
# ============== Tag Python3 GPU Containers ==============
416460
417461
CONTAINER_TAG="$TL_VERSION"-gpu-py3
418462
docker tag latest_py3_gpu:latest tensorlayer/tensorlayer:"$CONTAINER_TAG"
419463
docker push tensorlayer/tensorlayer:"$CONTAINER_TAG"
464+
465+
CONTAINER_TAG="$TL_VERSION"-py3-gpu
466+
docker tag latest_py3_gpu:latest tensorlayer/tensorlayer:"$CONTAINER_TAG"
467+
docker push tensorlayer/tensorlayer:"$CONTAINER_TAG"
420468
421469
###################################################################################
422470
###################################################################################

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,8 @@ To release a new version, please update the changelog as followed:
107107
- `tl.files` refactored into a directory with numerous files (by @DEKHTIARJonathan in #657)
108108
- `tl.files.voc_dataset` fixed because of original Pascal VOC website was down (by @DEKHTIARJonathan in #657)
109109
- extra requirements hidden inside the library added in the project requirements (by @DEKHTIARJonathan in #657)
110-
- requirements files refactored in `requirements/` directory (by @DEKHTIARJonathan in #657)
110+
- requirements files refactored in `requirements/` directory (by @DEKHTIARJonathan in #657)
111+
- README.md and other markdown files have been refactored and cleaned. (by @zsdonghao @DEKHTIARJonathan @luomai in #639)
111112
- Ternary Convolution Layer added in unittest (by @DEKHTIARJonathan in #658)
112113
- Convolution Layers unittests have been cleaned & refactored (by @DEKHTIARJonathan in #658)
113114

CONTRIBUTING.md

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
# Contributing to TensorLayer
1+
# TensorLayer Contributor Guideline
2+
3+
## Continuous integration
24

35
We appreciate contributions
46
either by adding / improving examples or extending / fixing the core library.
@@ -17,3 +19,37 @@ make format
1719
```
1820

1921
to apply those tools before submitting your PR.
22+
23+
## Build from sources
24+
25+
```bash
26+
# First clone the repository
27+
git clone https://github.com/tensorlayer/tensorlayer.git
28+
cd tensorlayer
29+
30+
# Install virtualenv if necessary
31+
pip install virtualenv
32+
33+
# Then create a virtualenv called venv inside
34+
virtualenv venv
35+
36+
# Activate the virtualenv
37+
38+
# Linux:
39+
source venv/bin/activate
40+
41+
# Windows:
42+
venv\Scripts\activate.bat
43+
44+
# for a machine **without** an NVIDIA GPU
45+
pip install -e .[tf_cpu,db,dev,doc,extra,test]
46+
47+
# for a machine **with** an NVIDIA GPU
48+
pip install -e .[tf_gpu,db,dev,doc,extra,test]
49+
```
50+
51+
Launching the unittest:
52+
53+
```bash
54+
$ pytest
55+
```

0 commit comments

Comments
 (0)