Skip to content

Commit 8aee566

Browse files
committed
Merge branch 'work/cmake' into 'master'
build with cmake See merge request deep-learning/tensornet!23
2 parents 9ba2597 + 2913b02 commit 8aee566

39 files changed

+4607
-44
lines changed

.bumpversion.cfg

+2
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,5 @@ values =
2121
[bumpversion:file:tensornet/version.py]
2222

2323
[bumpversion:file:pyproject.toml]
24+
search = version = "{current_version}"
25+
replace = version = "{new_version}"

.cmake-format.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
line_width: 120

.gitattributes

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# SCM syntax highlighting & preventing 3-way merges
2+
pixi.lock merge=binary linguist-language=YAML linguist-generated=true

.gitignore

+99-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
workspace/
22

3-
# Created by https://www.toptal.com/developers/gitignore/api/vim,bazel,linux,macos,python,intellij+all,visualstudiocode
4-
# Edit at https://www.toptal.com/developers/gitignore?templates=vim,bazel,linux,macos,python,intellij+all,visualstudiocode
3+
# pixi environments
4+
.pixi
5+
*.egg-info
6+
7+
# Created by https://www.toptal.com/developers/gitignore/api/vim,bazel,cmake,linux,macos,python,intellij+all,visualstudiocode,c,c++
8+
# Edit at https://www.toptal.com/developers/gitignore?templates=vim,bazel,cmake,linux,macos,python,intellij+all,visualstudiocode,c,c++
59

610
### Bazel ###
711
# gitignore template for Bazel build system
@@ -18,6 +22,98 @@ workspace/
1822
/.aswb/
1923
/.clwb/
2024

25+
### C ###
26+
# Prerequisites
27+
*.d
28+
29+
# Object files
30+
*.o
31+
*.ko
32+
*.obj
33+
*.elf
34+
35+
# Linker output
36+
*.ilk
37+
*.map
38+
*.exp
39+
40+
# Precompiled Headers
41+
*.gch
42+
*.pch
43+
44+
# Libraries
45+
*.lib
46+
*.a
47+
*.la
48+
*.lo
49+
50+
# Shared objects (inc. Windows DLLs)
51+
*.dll
52+
*.so
53+
*.so.*
54+
*.dylib
55+
56+
# Executables
57+
*.exe
58+
*.out
59+
*.app
60+
*.i*86
61+
*.x86_64
62+
*.hex
63+
64+
# Debug files
65+
*.dSYM/
66+
*.su
67+
*.idb
68+
*.pdb
69+
70+
# Kernel Module Compile Results
71+
*.mod*
72+
*.cmd
73+
.tmp_versions/
74+
modules.order
75+
Module.symvers
76+
Mkfile.old
77+
dkms.conf
78+
79+
### C++ ###
80+
# Prerequisites
81+
82+
# Compiled Object files
83+
*.slo
84+
85+
# Precompiled Headers
86+
87+
# Compiled Dynamic libraries
88+
89+
# Fortran module files
90+
*.mod
91+
*.smod
92+
93+
# Compiled Static libraries
94+
*.lai
95+
96+
# Executables
97+
98+
### CMake ###
99+
CMakeLists.txt.user
100+
CMakeCache.txt
101+
CMakeFiles
102+
CMakeScripts
103+
Testing
104+
Makefile
105+
cmake_install.cmake
106+
install_manifest.txt
107+
compile_commands.json
108+
CTestTestfile.cmake
109+
_deps
110+
111+
### CMake Patch ###
112+
CMakeUserPresets.json
113+
114+
# External projects
115+
*-prefix/
116+
21117
### Intellij+all ###
22118
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
23119
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
@@ -161,7 +257,6 @@ __pycache__/
161257
*$py.class
162258

163259
# C extensions
164-
*.so
165260

166261
# Distribution / packaging
167262
.Python
@@ -365,4 +460,4 @@ tags
365460
.history
366461
.ionide
367462

368-
# End of https://www.toptal.com/developers/gitignore/api/vim,bazel,linux,macos,python,intellij+all,visualstudiocode
463+
# End of https://www.toptal.com/developers/gitignore/api/vim,bazel,cmake,linux,macos,python,intellij+all,visualstudiocode,c,c++

.pixi/rc.sh

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
2+
# put activation scripts under .pixi/activate.d/ folder to setup
3+
# development environment, such as export https_proxy.
4+
5+
if [ -d "${PIXI_PROJECT_ROOT:=.}/.pixi/activate.d" ]; then
6+
__f_err=0
7+
while IFS='' read -r __f; do
8+
# shellcheck source=/dev/null
9+
. "$__f" || __f_err=$?
10+
if [ $__f_err != 0 ]; then
11+
if tty -s 2>/dev/null; then
12+
echo "[WARN] fail to source file $__f with err=$__f_err, skip the following activate scripts." >/dev/tty
13+
fi
14+
break
15+
fi
16+
done <<-END
17+
$(find "$PIXI_PROJECT_ROOT/.pixi/activate.d" -name '*.sh')
18+
END
19+
( exit $__f_err )
20+
fi

0 commit comments

Comments
 (0)