From 4968e6400e686dca52822af43dfb4687b098a65b Mon Sep 17 00:00:00 2001 From: bbig Date: Tue, 23 May 2023 17:03:23 +0800 Subject: [PATCH] test_v1.1 --- encoders/__init__.py | 6 ----- encoders/alphago.py | 5 ---- encoders/alphago_test.py | 26 ------------------- encoders/base.py | 8 ------ encoders/oneplane.py | 3 +-- go_sgf/__init__.py | 0 {gosgf => go_sgf}/sgf.py | 0 {gosgf => go_sgf}/sgf_grammar.py | 0 {gosgf => go_sgf}/sgf_properties.py | 0 gosgf/__init__.py | 1 - networks/__init__.py | 5 ---- networks/fullyconnected.py | 14 ---------- networks/large.py | 39 ---------------------------- networks/leaky.py | 40 ----------------------------- networks/medium.py | 31 ---------------------- networks/small.py | 33 ------------------------ policies/__init__.py | 0 17 files changed, 1 insertion(+), 210 deletions(-) delete mode 100644 encoders/alphago_test.py create mode 100644 go_sgf/__init__.py rename {gosgf => go_sgf}/sgf.py (100%) rename {gosgf => go_sgf}/sgf_grammar.py (100%) rename {gosgf => go_sgf}/sgf_properties.py (100%) delete mode 100644 gosgf/__init__.py delete mode 100644 networks/fullyconnected.py delete mode 100644 networks/large.py delete mode 100644 networks/leaky.py delete mode 100644 networks/medium.py delete mode 100644 networks/small.py create mode 100644 policies/__init__.py diff --git a/encoders/__init__.py b/encoders/__init__.py index 27cb0ab..e69de29 100644 --- a/encoders/__init__.py +++ b/encoders/__init__.py @@ -1,6 +0,0 @@ -from tugo.encoders.base import * -#from tugo.encoders.alphago import * -#from tugo.encoders.betago import * -from tugo.encoders.oneplane import * -from tugo.encoders.sevenplane import * -from tugo.encoders.simple import * diff --git a/encoders/alphago.py b/encoders/alphago.py index 3a57e55..aa964af 100644 --- a/encoders/alphago.py +++ b/encoders/alphago.py @@ -134,8 +134,3 @@ class AlphaGoEncoder(Encoder): def shape(self): return self.num_planes, self.board_height, self.board_width - - -def create(board_size): - return AlphaGoEncoder(board_size) - diff --git a/encoders/alphago_test.py b/encoders/alphago_test.py deleted file mode 100644 index 2895bb5..0000000 --- a/encoders/alphago_test.py +++ /dev/null @@ -1,26 +0,0 @@ -import unittest - -from tugo.agent.helpers import is_point_an_eye -from tugo.goboard_fast import Board, GameState, Move -from tugo.gotypes import Player, Point -from tugo.encoders.alphago import AlphaGoEncoder - - -class AlphaGoEncoderTest(unittest.TestCase): - def test_encoder(self): - alphago = AlphaGoEncoder() - - start = GameState.new_game(19) - next_state = start.apply_move(Move.play(Point(16, 16))) - alphago.encode(next_state) - - self.assertEquals(alphago.name(), 'alphago') - self.assertEquals(alphago.board_height, 19) - self.assertEquals(alphago.board_width, 19) - self.assertEquals(alphago.num_planes, 49) - self.assertEquals(alphago.shape(), (49, 19, 19)) - - - -if __name__ == '__main__': - unittest.main() diff --git a/encoders/base.py b/encoders/base.py index 5276fa2..268c0c7 100644 --- a/encoders/base.py +++ b/encoders/base.py @@ -1,12 +1,4 @@ -# tag::importlib[] import importlib -# end::importlib[] - -__all__ = [ - 'Encoder', - 'get_encoder_by_name', -] - # tag::base_encoder[] class Encoder: diff --git a/encoders/oneplane.py b/encoders/oneplane.py index b76c8cf..23ac364 100644 --- a/encoders/oneplane.py +++ b/encoders/oneplane.py @@ -1,9 +1,8 @@ -# tag::oneplane_imports[] import numpy as np from tugo.encoders.base import Encoder from tugo.goboard import Point -# end::oneplane_imports[] + # tag::oneplane_encoder[] diff --git a/go_sgf/__init__.py b/go_sgf/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/gosgf/sgf.py b/go_sgf/sgf.py similarity index 100% rename from gosgf/sgf.py rename to go_sgf/sgf.py diff --git a/gosgf/sgf_grammar.py b/go_sgf/sgf_grammar.py similarity index 100% rename from gosgf/sgf_grammar.py rename to go_sgf/sgf_grammar.py diff --git a/gosgf/sgf_properties.py b/go_sgf/sgf_properties.py similarity index 100% rename from gosgf/sgf_properties.py rename to go_sgf/sgf_properties.py diff --git a/gosgf/__init__.py b/gosgf/__init__.py deleted file mode 100644 index 2dd8f84..0000000 --- a/gosgf/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from .sgf import * diff --git a/networks/__init__.py b/networks/__init__.py index a105c3a..28ab3f0 100644 --- a/networks/__init__.py +++ b/networks/__init__.py @@ -1,6 +1 @@ -#from .fullyconnected import * -#from .large import * -#from .leaky import * -#from .medium import * -#from .small import * from .alphago import * diff --git a/networks/fullyconnected.py b/networks/fullyconnected.py deleted file mode 100644 index 8a71187..0000000 --- a/networks/fullyconnected.py +++ /dev/null @@ -1,14 +0,0 @@ -from __future__ import absolute_import -from keras.layers.core import Dense, Activation, Flatten - - -def layers(input_shape): - return [ - Dense(128, input_shape=input_shape), - Activation('relu'), - Dense(128, input_shape=input_shape), - Activation('relu'), - Flatten(), - Dense(128), - Activation('relu'), - ] diff --git a/networks/large.py b/networks/large.py deleted file mode 100644 index 5294b22..0000000 --- a/networks/large.py +++ /dev/null @@ -1,39 +0,0 @@ -from __future__ import absolute_import -from keras.layers.core import Dense, Activation, Flatten -from keras.layers.convolutional import Conv2D, ZeroPadding2D - - -def layers(input_shape): - return [ - ZeroPadding2D((3, 3), input_shape=input_shape, data_format='channels_first'), - Conv2D(64, (7, 7), padding='valid', data_format='channels_first'), - Activation('relu'), - - ZeroPadding2D((2, 2), data_format='channels_first'), - Conv2D(64, (5, 5), data_format='channels_first'), - Activation('relu'), - - ZeroPadding2D((2, 2), data_format='channels_first'), - Conv2D(64, (5, 5), data_format='channels_first'), - Activation('relu'), - - ZeroPadding2D((2, 2), data_format='channels_first'), - Conv2D(48, (5, 5), data_format='channels_first'), - Activation('relu'), - - ZeroPadding2D((2, 2), data_format='channels_first'), - Conv2D(48, (5, 5), data_format='channels_first'), - Activation('relu'), - - ZeroPadding2D((2, 2), data_format='channels_first'), - Conv2D(32, (5, 5), data_format='channels_first'), - Activation('relu'), - - ZeroPadding2D((2, 2), data_format='channels_first'), - Conv2D(32, (5, 5), data_format='channels_first'), - Activation('relu'), - - Flatten(), - Dense(1024), - Activation('relu'), - ] diff --git a/networks/leaky.py b/networks/leaky.py deleted file mode 100644 index 83ef9c7..0000000 --- a/networks/leaky.py +++ /dev/null @@ -1,40 +0,0 @@ -from __future__ import absolute_import -from keras.layers import LeakyReLU -from keras.layers.core import Dense, Flatten -from keras.layers.convolutional import Conv2D, ZeroPadding2D - - -def layers(input_shape): - return [ - ZeroPadding2D((3, 3), input_shape=input_shape, data_format='channels_first'), - Conv2D(64, (7, 7), padding='valid', data_format='channels_first'), - LeakyReLU(), - - ZeroPadding2D((2, 2), data_format='channels_first'), - Conv2D(64, (5, 5), data_format='channels_first'), - LeakyReLU(), - - ZeroPadding2D((2, 2), data_format='channels_first'), - Conv2D(64, (5, 5), data_format='channels_first'), - LeakyReLU(), - - ZeroPadding2D((2, 2), data_format='channels_first'), - Conv2D(48, (5, 5), data_format='channels_first'), - LeakyReLU(), - - ZeroPadding2D((2, 2), data_format='channels_first'), - Conv2D(48, (5, 5), data_format='channels_first'), - LeakyReLU(), - - ZeroPadding2D((2, 2), data_format='channels_first'), - Conv2D(32, (5, 5), data_format='channels_first'), - LeakyReLU(), - - ZeroPadding2D((2, 2), data_format='channels_first'), - Conv2D(32, (5, 5), data_format='channels_first'), - LeakyReLU(), - - Flatten(), - Dense(1024), - LeakyReLU(), - ] diff --git a/networks/medium.py b/networks/medium.py deleted file mode 100644 index cf6131a..0000000 --- a/networks/medium.py +++ /dev/null @@ -1,31 +0,0 @@ -from __future__ import absolute_import -from keras.layers.core import Dense, Activation, Flatten -from keras.layers.convolutional import Conv2D, ZeroPadding2D - - -def layers(input_shape): - return [ - ZeroPadding2D((2, 2), input_shape=input_shape, data_format='channels_first'), - Conv2D(64, (5, 5), padding='valid', data_format='channels_first'), - Activation('relu'), - - ZeroPadding2D((2, 2), data_format='channels_first'), - Conv2D(64, (5, 5), data_format='channels_first'), - Activation('relu'), - - ZeroPadding2D((1, 1), data_format='channels_first'), - Conv2D(64, (3, 3), data_format='channels_first'), - Activation('relu'), - - ZeroPadding2D((1, 1), data_format='channels_first'), - Conv2D(64, (3, 3), data_format='channels_first'), - Activation('relu'), - - ZeroPadding2D((1, 1), data_format='channels_first'), - Conv2D(64, (3, 3), data_format='channels_first'), - Activation('relu'), - - Flatten(), - Dense(512), - Activation('relu'), - ] diff --git a/networks/small.py b/networks/small.py deleted file mode 100644 index 6a7d0e0..0000000 --- a/networks/small.py +++ /dev/null @@ -1,33 +0,0 @@ -from __future__ import absolute_import - -# tag::small_network[] -from keras.layers.core import Dense, Activation, Flatten -from keras.layers.convolutional import Conv2D, ZeroPadding2D - - -def layers(input_shape): - return [ - ZeroPadding2D(padding=3, input_shape=input_shape, data_format='channels_first'), # <1> - Conv2D(48, (7, 7), data_format='channels_first'), - Activation('relu'), - - ZeroPadding2D(padding=2, data_format='channels_first'), # <2> - Conv2D(32, (5, 5), data_format='channels_first'), - Activation('relu'), - - ZeroPadding2D(padding=2, data_format='channels_first'), - Conv2D(32, (5, 5), data_format='channels_first'), - Activation('relu'), - - ZeroPadding2D(padding=2, data_format='channels_first'), - Conv2D(32, (5, 5), data_format='channels_first'), - Activation('relu'), - - Flatten(), - Dense(512), - Activation('relu'), - ] - -# <1> We use zero padding layers to enlarge input images. -# <2> By using `channels_first` we specify that the input plane dimension for our features comes first. -# end::small_network[] diff --git a/policies/__init__.py b/policies/__init__.py new file mode 100644 index 0000000..e69de29