Commit 88f47819 authored by royus's avatar royus
Browse files

Merge branch 'master' of togawa-gitlab:adc2018/adc2018-system

parents ae727a1f 634fafa2
Loading
Loading
Loading
Loading
+41 −41
Changes for 2018Q_create/2018_A3.txt: 41 added lines, 41 removed lines.
Original line number Diff line number Diff line
SIZE 8X8X8
LAYER 1
2,35,35,35,15,19,17,9
7,35,37,37,15,19,17,11
7,35,37,39,19,19,11,11
7,35,37,39,19,11,11,0
7,35,37,39,11,11,0,0
0,35,37,39,11,0,0,0
0,11,11,11,11,0,3,4
7,35,37,37,15,15,17,11
7,35,37,39,0,0,0,11
7,35,37,39,0,0,0,11
0,35,37,39,0,0,0,11
0,35,37,39,0,11,11,11
0,11,11,11,11,11,3,4
1,0,0,0,0,0,3,4
LAYER 2
2,33,31,43,43,0,41,9
25,25,31,43,15,15,17,11
0,25,31,43,43,15,17,13
0,25,31,0,19,15,17,13
7,25,31,0,19,15,17,13
7,25,31,0,19,15,17,13
0,25,31,0,19,17,17,0
1,25,0,19,19,0,3,4
2,33,31,0,43,19,41,9
25,0,31,0,43,15,17,11
25,0,31,0,43,15,17,13
7,7,7,7,0,15,17,13
27,27,27,7,0,15,17,13
0,0,0,7,0,15,17,13
25,25,0,7,0,17,17,0
1,25,0,7,7,7,3,4
LAYER 3
2,33,0,0,0,0,41,9
41,41,41,41,41,41,41,9
0,0,0,0,0,0,0,9
0,0,30,30,30,0,0,9
27,27,27,27,27,27,27,9
7,7,7,7,30,15,9,9
0,31,31,7,7,9,9,0
1,25,25,19,7,9,3,4
2,33,0,0,41,19,41,9
41,41,41,41,41,19,0,9
25,0,31,0,0,19,0,9
25,31,31,0,19,19,0,9
27,31,27,27,27,27,27,9
25,31,30,30,30,15,9,9
25,31,30,0,19,9,9,0
1,25,25,19,19,9,3,4
LAYER 4
2,33,0,0,0,0,21,21
0,33,47,23,48,48,21,45
0,33,0,23,0,48,21,45
0,33,30,23,30,48,21,45
0,33,30,23,30,48,21,45
0,33,30,23,30,15,21,45
0,30,30,23,0,15,21,45
2,33,0,0,41,41,41,21
0,33,47,23,48,48,0,45
0,33,47,23,0,48,0,45
25,33,47,23,19,48,0,45
25,33,0,23,19,48,0,45
25,33,0,23,19,15,0,45
0,30,30,23,19,15,0,45
1,1,1,21,21,15,4,4
LAYER 5
2,6,16,16,22,22,22,22
46,6,47,16,24,29,29,22
46,0,47,16,24,29,34,22
46,0,47,16,24,0,34,22
46,0,47,16,24,48,34,22
46,22,47,0,24,48,34,0
46,22,47,47,24,48,21,0
2,6,16,22,22,0,0,21
46,6,16,22,24,29,29,21
46,16,16,22,24,29,34,21
46,16,47,22,24,0,34,21
46,16,47,22,24,48,34,21
46,22,47,22,24,48,34,21
46,22,47,47,24,48,21,21
22,22,1,0,21,21,21,0
LAYER 6
2,5,10,20,20,26,26,26
6,6,10,20,0,32,32,26
10,10,10,29,29,29,0,26
10,28,28,28,28,28,28,28
10,0,0,16,0,22,22,22
10,22,22,22,22,22,34,0
10,16,16,16,0,0,0,0
10,22,22,22,0,0,34,0
10,42,42,42,42,42,42,42
10,42,1,1,1,1,1,1
LAYER 7
@@ -65,9 +65,9 @@ LAYER 7
LAYER 8
2,2,2,2,2,2,2,2
6,5,0,12,12,12,12,0
0,0,0,12,40,38,36,0
0,0,12,12,40,38,36,0
12,12,12,16,40,38,36,0
12,12,12,12,40,38,36,0
12,0,0,0,40,38,36,0
12,0,0,16,40,38,36,0
12,0,0,16,40,38,36,0
12,18,0,16,38,38,36,8
10,18,20,16,36,36,36,1
+1 −1
Changes for 2018Q_create/2018_Q2.txt: 1 added line, 1 removed line.
Original line number Diff line number Diff line
SIZE 72X72X8
LINE_NUM 14
LINE_NUM 22 

LINE#1 (36,71,8) (36,71,2)
LINE#2 (37,71,5) (38,71,5)
+1 −1
Changes for 2018Q_create/2018_Q3.txt: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ LINE#3 (6,6,1) (6,7,3)
LINE#4 (6,7,4) (7,6,1)
LINE#5 (1,1,8) (1,0,6)
LINE#6 (0,1,8) (1,0,5)
LINE#7 (0,1,1) (5,7,3)
LINE#7 (0,1,1) (5,7,2)
LINE#8 (7,6,8) (2,0,7)
LINE#9 (5,7,3) (7,0,1)
LINE#10 (2,0,6) (0,7,8)

LICENSE

0 → 100644
+674 −0

File added.

Preview size limit exceeded, changes collapsed.

+41 −1
Changes for README.md: 41 added lines, 1 removed line.
Original line number Diff line number Diff line
# ADC2018
---

A cooperative system using multiple FPGAs for a simple 3D-Numberlink puzzle solver

## Environments

実際のソルバで使用している環境.

+ デバイス
    - Raspberry Pi 3 B+
    - PYNQ
    - ZU3EG

+ ソフトウェア
    - Python >= 3.5 (通信プログラム)
        * Flask
        * gevent
        * gevent-websocket
    - Vivado (Web Pack) >= 18.1 (FPGAの合成)

## Setups

[Wiki](https://www.togawa.cs.waseda.ac.jp/gitlab/adc2018/adc2018-system/wikis/home)も参照されたい.

各端末でこのリポジトリをCloneする.

```
cd ~
git clone https://www.togawa.cs.waseda.ac.jp/gitlab/adc2018/adc2018-system.git
```

## System

+ サーバ
    - [通信用スクリプト](comm/server)
+ ソルバ
    - [通信用スクリプト](comm/client)
    - [高位合成用プログラム](hls)
+ リゾルバ
    - [通信用スクリプト](comm/resolver)

## Our previous works

* [pynq-router](https://github.com/kotarot/pynq-router)
* [nl-solver](https://github.com/kotarot/nl-solver)

## License
This software is released under GPL v3 License, see [LICENSE](LICENSE).
Loading