Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

code reorganization #2041

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

code reorganization #2041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2a1d2c6
move rescorer to trainingdata
borg323 Jun 29, 2024
e8c50aa
merge benchmark and lc0ctl directories into tools
borg323 Jun 29, 2024
3f7aa62
move backends to neural/backends
borg323 Jun 29, 2024
0eb0c49
fix build
borg323 Jun 29, 2024
4e58d0f
Merge branch 'master' into reorganization
borg323 Sep 26, 2024
0879fd6
handle backend shared files
borg323 Sep 26, 2024
283ed55
clean up activation sharing
borg323 Sep 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
106 changes: 53 additions & 53 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,12 +181,7 @@ common_files += [
]

files += [
'src/benchmark/backendbench.cc',
'src/benchmark/benchmark.cc',
'src/engine.cc',
'src/lc0ctl/describenet.cc',
'src/lc0ctl/leela2onnx.cc',
'src/lc0ctl/onnx2leela.cc',
'src/mcts/params.cc',
'src/mcts/search.cc',
'src/mcts/stoppers/alphazero.cc',
Expand All @@ -197,27 +192,33 @@ files += [
'src/mcts/stoppers/smooth.cc',
'src/mcts/stoppers/stoppers.cc',
'src/mcts/stoppers/timemgr.cc',
'src/neural/backends/network_check.cc',
'src/neural/backends/network_demux.cc',
'src/neural/backends/network_mux.cc',
'src/neural/backends/network_random.cc',
'src/neural/backends/network_record.cc',
'src/neural/backends/network_rr.cc',
'src/neural/backends/network_trivial.cc',
'src/neural/cache.cc',
'src/neural/factory.cc',
'src/neural/loader.cc',
'src/neural/network_check.cc',
'src/neural/network_demux.cc',
'src/neural/network_legacy.cc',
'src/neural/network_mux.cc',
'src/neural/network_random.cc',
'src/neural/network_record.cc',
'src/neural/network_rr.cc',
'src/neural/network_trivial.cc',
'src/neural/onnx/adapters.cc',
'src/neural/onnx/builder.cc',
'src/neural/onnx/converter.cc',
'src/neural/xla/hlo_builder.cc',
'src/neural/xla/onnx2hlo.cc',
'src/neural/xla/print_hlo.cc',
'src/neural/xla/xla_tensor.cc',
'src/selfplay/game.cc',
'src/selfplay/loop.cc',
'src/selfplay/multigame.cc',
'src/selfplay/tournament.cc',
'src/tools/backendbench.cc',
'src/tools/benchmark.cc',
'src/tools/describenet.cc',
'src/tools/leela2onnx.cc',
'src/tools/onnx2leela.cc',
'src/utils/histogram.cc',
'src/utils/numa.cc',
'src/utils/weights_adapter.cc',
Expand Down Expand Up @@ -248,7 +249,7 @@ if get_option('build_backends')
tf_tensorflow_cc_lib = dependency('tensorflow_cc', required: false)
if get_option('tensorflow') and tf_dl_lib.found() and tf_tensorflow_cc_lib.found()
deps += [tf_dl_lib, tf_tensorflow_cc_lib]
files += 'src/neural/network_tf_cc.cc'
files += 'src/neural/backends/network_tf_cc.cc'
has_backends = true
endif

Expand Down Expand Up @@ -373,25 +374,25 @@ if get_option('build_backends')
endif

blas_files = [
'src/neural/blas/convolution1.cc',
'src/neural/blas/fully_connected_layer.cc',
'src/neural/blas/se_unit.cc',
'src/neural/blas/network_blas.cc',
'src/neural/blas/winograd_convolution3.cc'
'src/neural/backends/blas/convolution1.cc',
'src/neural/backends/blas/fully_connected_layer.cc',
'src/neural/backends/blas/se_unit.cc',
'src/neural/backends/blas/network_blas.cc',
'src/neural/backends/blas/winograd_convolution3.cc'
]

shared_files = [
'src/neural/shared/activation.cc',
'src/neural/shared/winograd_filter.cc',
'src/neural/backends/shared/activation.cc',
'src/neural/backends/shared/winograd_filter.cc',
]

files += blas_files
has_backends = true

if get_option('ispc') and ispc.found()
files += iscp_gen.process('src/neural/blas/winograd_transform.ispc')
files += iscp_gen.process('src/neural/blas/layer_norm.ispc')
files += iscp_gen.process('src/neural/shared/activation.ispc')
files += iscp_gen.process('src/neural/backends/blas/winograd_transform.ispc')
files += iscp_gen.process('src/neural/backends/blas/layer_norm.ispc')
files += iscp_gen.process('src/neural/backends/shared/activation.ispc')
add_project_arguments('-DUSE_ISPC', language : 'cpp')
endif

Expand Down Expand Up @@ -421,15 +422,15 @@ if get_option('build_backends')
if get_option('opencl') and has_opencl

opencl_files = [
'src/neural/opencl/network_opencl.cc',
'src/neural/opencl/OpenCL.cc',
'src/neural/opencl/OpenCLTuner.cc',
'src/neural/opencl/OpenCLBuffers.cc',
'src/neural/backends/opencl/network_opencl.cc',
'src/neural/backends/opencl/OpenCL.cc',
'src/neural/backends/opencl/OpenCLTuner.cc',
'src/neural/backends/opencl/OpenCLBuffers.cc',
]

shared_files = [
'src/neural/shared/activation.cc',
'src/neural/shared/winograd_filter.cc',
'src/neural/backends/shared/activation.cc',
'src/neural/backends/shared/winograd_filter.cc',
]

if not opencl_framework.found()
Expand All @@ -455,21 +456,21 @@ if get_option('build_backends')

if (get_option('cudnn') or get_option('plain_cuda')) and cu_blas.found() and cu_dart.found() and nvcc.found()
deps += [cu_blas, cu_dart]
cuda_files = ['src/neural/cuda/layers.cc']
cuda_files = ['src/neural/backends/cuda/layers.cc']
if get_option('cudnn') and cu_dnn.found()
deps += cu_dnn
cuda_files += 'src/neural/cuda/network_cudnn.cc'
cuda_files += 'src/neural/cuda/network_cuda.cc' # To support newer nets.
cuda_files += 'src/neural/backends/cuda/network_cudnn.cc'
cuda_files += 'src/neural/backends/cuda/network_cuda.cc' # To support newer nets.
add_project_arguments('-DUSE_CUDNN', language : 'cpp')
elif get_option('plain_cuda')
cuda_files += 'src/neural/cuda/network_cuda.cc'
cuda_files += 'src/neural/backends/cuda/network_cuda.cc'
endif
foreach d : get_option('cudnn_include')
if run_command('scripts/checkdir.py', d, check : false).returncode() == 0
includes += include_directories(d, is_system: true)
endif
endforeach
includes += include_directories('src/neural/cuda/')
includes += include_directories('src/neural/backends/cuda/')

cuda_arguments = ['-c', '@INPUT@', '-o', '@OUTPUT@',
'-I', meson.current_source_dir() + '/src']
Expand Down Expand Up @@ -523,16 +524,16 @@ if get_option('build_backends')
endif
files += cuda_files
files += custom_target('cuda fp32 code',
input : 'src/neural/cuda/common_kernels.cu',
input : 'src/neural/backends/cuda/common_kernels.cu',
output : outputname,
depend_files: 'src/neural/cuda/winograd_helper.inc',
depend_files: 'src/neural/backends/cuda/winograd_helper.inc',
command : [nvcc, nvcc_extra_args, cuda_arguments]
)

files += custom_target('cuda fp16 code',
input : 'src/neural/cuda/fp16_kernels.cu',
input : 'src/neural/backends/cuda/fp16_kernels.cu',
output : outputname,
depend_files: 'src/neural/cuda/winograd_helper.inc',
depend_files: 'src/neural/backends/cuda/winograd_helper.inc',
command : [nvcc, nvcc_extra_args, cuda_arguments]
)
has_backends = true
Expand All @@ -548,14 +549,14 @@ if get_option('build_backends')
dx_dxgi = cc.find_library('dxgi')

dx_files = [
'src/neural/dx/network_dx.cc',
'src/neural/dx/shader_wrapper.cc',
'src/neural/dx/layers_dx.cc',
'src/neural/backends/dx/network_dx.cc',
'src/neural/backends/dx/shader_wrapper.cc',
'src/neural/backends/dx/layers_dx.cc',
]
files += dx_files
deps += [dx_d3d12, dx_dxgi]

subdir('src/neural/dx/shaders')
subdir('src/neural/backends/dx/shaders')

has_backends = true
endif
Expand All @@ -564,8 +565,8 @@ if get_option('build_backends')
includes += include_directories(get_option('dnnl_dir') + '/include')
deps += [ dnnl_lib, dependency('openmp', required:true) ]
files += [
'src/neural/onednn/network_onednn.cc',
'src/neural/onednn/layers.cc',
'src/neural/backends/onednn/network_onednn.cc',
'src/neural/backends/onednn/layers.cc',
]
has_backends = true
endif
Expand All @@ -586,7 +587,7 @@ if get_option('build_backends')
includes += include_directories(get_option('onnx_include') + '/../providers/cpu',
is_system: true)
endif
files += 'src/neural/onnx/network_onnx.cc'
files += 'src/neural/backends/network_onnx.cc'
if cc.find_library('onnxruntime_providers_rocm',
dirs: get_option('onnx_libdir'), required: false).found()
add_project_arguments('-DUSE_ROCM', language : 'cpp')
Expand All @@ -607,9 +608,9 @@ if get_option('build_backends')
deps += metal_frameworks

files += [
'src/neural/metal/network_metal.cc',
'src/neural/metal/mps/NetworkGraph.mm',
'src/neural/metal/mps/MetalNetworkBuilder.mm',
'src/neural/backends/metal/network_metal.cc',
'src/neural/backends/metal/mps/NetworkGraph.mm',
'src/neural/backends/metal/mps/MetalNetworkBuilder.mm',
]

has_backends = true
Expand All @@ -623,10 +624,9 @@ if get_option('build_backends')
## ~~~~~~~~
if get_option('xla')
files += [
'src/neural/xla/network_xla.cc',
'src/neural/xla/pjrt.cc',
'src/neural/xla/xla_runner.cc',
'src/neural/xla/xla_tensor.cc',
'src/neural/backends/xla/network_xla.cc',
'src/neural/backends/xla/pjrt.cc',
'src/neural/backends/xla/xla_runner.cc',
]
deps += cc.find_library('dl', required: false)
has_backends = true
Expand Down Expand Up @@ -702,7 +702,7 @@ endif
if get_option('rescorer')
deps += subproject('gaviotatb').get_variable('gaviotatb_dep')
executable('rescorer', 'src/rescorer_main.cc',
[common_files, 'src/rescorer/rescoreloop.cc'],
[common_files, 'src/trainingdata/rescoreloop.cc'],
include_directories: includes, dependencies: deps, install: true)
endif

Expand Down
10 changes: 5 additions & 5 deletions src/main.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@
Program grant you additional permission to convey the resulting work.
*/

#include "benchmark/backendbench.h"
#include "benchmark/benchmark.h"
#include "chess/board.h"
#include "engine.h"
#include "lc0ctl/describenet.h"
#include "lc0ctl/leela2onnx.h"
#include "lc0ctl/onnx2leela.h"
#include "selfplay/loop.h"
#include "tools/backendbench.h"
#include "tools/benchmark.h"
#include "tools/describenet.h"
#include "tools/leela2onnx.h"
#include "tools/onnx2leela.h"
#include "utils/commandline.h"
#include "utils/esc_codes.h"
#include "utils/logging.h"
Expand Down
0 src/neural/blas/README.md → src/neural/backends/blas/README.md
View file
Open in desktop
File renamed without changes.
0 src/neural/blas/blas.h → src/neural/backends/blas/blas.h
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions src/neural/blas/convolution1.cc → src/neural/backends/blas/convolution1.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
along with Leela Chess. If not, see <http://www.gnu.org/licenses/>.
*/

#include "neural/blas/convolution1.h"
#include "neural/blas/blas.h"
#include "neural/backends/blas/convolution1.h"
#include "neural/backends/blas/blas.h"

#include <Eigen/Dense>

Expand Down
0 src/neural/blas/convolution1.h → src/neural/backends/blas/convolution1.h
View file
Open in desktop
File renamed without changes.
2 changes: 0 additions & 2 deletions src/neural/blas/encoder.h → src/neural/backends/blas/encoder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@

#include <cmath>

#include "neural/shared/activation.h"

#ifdef USE_ISPC
#include "layer_norm_ispc.h"
#endif
Expand Down
5 changes: 2 additions & 3 deletions src/neural/blas/fully_connected_layer.cc → ...al/backends/blas/fully_connected_layer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,8 @@
along with Leela Chess. If not, see <http://www.gnu.org/licenses/>.
*/

#include "neural/blas/fully_connected_layer.h"
#include "neural/blas/blas.h"
#include "neural/shared/activation.h"
#include "neural/backends/blas/fully_connected_layer.h"
#include "neural/backends/blas/blas.h"

#include <algorithm>
#include <cassert>
Expand Down
2 changes: 1 addition & 1 deletion src/neural/blas/fully_connected_layer.h → ...ral/backends/blas/fully_connected_layer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

#pragma once

#include "neural/shared/activation.h"
#include "neural/backends/shared/activation.h"

#include <cstddef>
#include <vector>
Expand Down
0 src/neural/blas/layer_norm.ispc → src/neural/backends/blas/layer_norm.ispc
View file
Open in desktop
File renamed without changes.
20 changes: 10 additions & 10 deletions src/neural/blas/network_blas.cc → src/neural/backends/blas/network_blas.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,19 @@
#include <cmath>
#include <iostream>

#include "neural/blas/blas.h"
#include "neural/blas/convolution1.h"
#include "neural/blas/encoder.h"
#include "neural/blas/fully_connected_layer.h"
#include "neural/blas/se_unit.h"
#include "neural/blas/winograd_convolution3.h"
#include "neural/backends/blas/blas.h"
#include "neural/backends/blas/convolution1.h"
#include "neural/backends/blas/encoder.h"
#include "neural/backends/blas/fully_connected_layer.h"
#include "neural/backends/blas/se_unit.h"
#include "neural/backends/blas/winograd_convolution3.h"
#include "neural/backends/shared/activation.h"
#include "neural/backends/shared/winograd_filter.h"
#include "neural/factory.h"
#include "neural/network.h"
#include "neural/network_legacy.h"
#include "neural/shared/activation.h"
#include "neural/shared/attention_policy_map.h"
#include "neural/shared/policy_map.h"
#include "neural/shared/winograd_filter.h"
#include "neural/tables/attention_policy_map.h"
#include "neural/tables/policy_map.h"
#include "utils/numa.h"

#ifdef USE_DNNL
Expand Down
4 changes: 2 additions & 2 deletions src/neural/blas/se_unit.cc → src/neural/backends/blas/se_unit.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
along with Leela Chess. If not, see <http://www.gnu.org/licenses/>.
*/

#include "neural/blas/se_unit.h"
#include "neural/blas/fully_connected_layer.h"
#include "neural/backends/blas/se_unit.h"
#include "neural/backends/blas/fully_connected_layer.h"

#include <cmath>

Expand Down
2 changes: 1 addition & 1 deletion src/neural/blas/se_unit.h → src/neural/backends/blas/se_unit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

#pragma once

#include "neural/shared/activation.h"
#include "neural/backends/shared/activation.h"

#include <cstddef>

Expand Down
4 changes: 2 additions & 2 deletions src/neural/blas/winograd_convolution3.cc → ...al/backends/blas/winograd_convolution3.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
along with Leela Chess. If not, see <http://www.gnu.org/licenses/>.
*/

#include "neural/blas/winograd_convolution3.h"
#include "neural/blas/blas.h"
#include "neural/backends/blas/winograd_convolution3.h"
#include "neural/backends/blas/blas.h"

#include <algorithm>
#include <cassert>
Expand Down
0 src/neural/blas/winograd_convolution3.h → ...ral/backends/blas/winograd_convolution3.h
View file
Open in desktop
File renamed without changes.
0 src/neural/blas/winograd_transform.ispc → ...ral/backends/blas/winograd_transform.ispc
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions src/neural/cuda/common_kernels.cu → src/neural/backends/cuda/common_kernels.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
#include <cassert>

#include "cuda_common.h"
#include "neural/shared/activation.h"
#include "neural/shared/attention_policy_map.h"
#include "neural/tables/activation_function.h"
#include "neural/tables/attention_policy_map.h"
#include "winograd_helper.inc"

namespace lczero {
Expand Down
0 src/neural/cuda/cuda_common.h → src/neural/backends/cuda/cuda_common.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion src/neural/cuda/fp16_kernels.cu → src/neural/backends/cuda/fp16_kernels.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
*/

#include "cuda_common.h"
#include "neural/shared/activation.h"
#include "neural/tables/activation_function.h"

// Allow building on an old architecture.
#if __CUDA_ARCH__ < 530
Expand Down
0 src/neural/cuda/inputs_outputs.h → src/neural/backends/cuda/inputs_outputs.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion src/neural/cuda/kernels.h → src/neural/backends/cuda/kernels.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
*/

#include "cuda_common.h"
#include "neural/shared/activation.h"
#include "neural/tables/activation_function.h"

namespace lczero {
namespace cudnn_backend {
Expand Down
Loading