Skip to content

Commit d1261dd

Browse files
steinbeckclaude
andcommitted
fix: correct nauty download URL and README improvements
- Fix nauty download URL: nauty29r3.tar.gz -> nauty2_9_3.tar.gz (404 fix) - README: use dynamic brew --prefix path for Homebrew symlink example - README: add -I /path/to/nauty to gcc compilation examples - CI: add C4H10 test to Windows build for parity with other platforms Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 24ab6ec commit d1261dd

File tree

4 files changed

+17
-14
lines changed

4 files changed

+17
-14
lines changed

.github/workflows/build.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ jobs:
1919
2020
- name: Build nauty
2121
run: |
22-
curl -L -o nauty29r3.tar.gz https://users.cecs.anu.edu.au/~bdm/nauty/nauty29r3.tar.gz
23-
tar xzf nauty29r3.tar.gz
22+
curl -L -o nauty2_9_3.tar.gz https://users.cecs.anu.edu.au/~bdm/nauty/nauty2_9_3.tar.gz
23+
tar xzf nauty2_9_3.tar.gz
2424
cd nauty2_9_3
2525
./configure && make
2626
@@ -114,8 +114,8 @@ jobs:
114114
115115
- name: Build nauty
116116
run: |
117-
curl -L -o nauty29r3.tar.gz https://users.cecs.anu.edu.au/~bdm/nauty/nauty29r3.tar.gz
118-
tar xzf nauty29r3.tar.gz
117+
curl -L -o nauty2_9_3.tar.gz https://users.cecs.anu.edu.au/~bdm/nauty/nauty2_9_3.tar.gz
118+
tar xzf nauty2_9_3.tar.gz
119119
cd nauty2_9_3
120120
./configure && make
121121
@@ -132,6 +132,7 @@ jobs:
132132
run: |
133133
./surge.exe -help 2>&1 | head -3
134134
./surge.exe -u C6H6
135+
./surge.exe -u C4H10
135136
136137
- name: Upload Windows binary
137138
uses: actions/upload-artifact@v4

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ jobs:
5757
- name: Build nauty from source (Linux/Windows)
5858
if: matrix.os == 'ubuntu-latest' || matrix.os == 'windows-latest'
5959
run: |
60-
curl -L -o nauty29r3.tar.gz https://users.cecs.anu.edu.au/~bdm/nauty/nauty29r3.tar.gz
61-
tar xzf nauty29r3.tar.gz
60+
curl -L -o nauty2_9_3.tar.gz https://users.cecs.anu.edu.au/~bdm/nauty/nauty2_9_3.tar.gz
61+
tar xzf nauty2_9_3.tar.gz
6262
cd nauty2_9_3
6363
./configure && make
6464

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ RUN apt-get update && \
88
WORKDIR /build
99

1010
# Download and build nauty
11-
RUN curl -L -o nauty29r3.tar.gz https://users.cecs.anu.edu.au/~bdm/nauty/nauty29r3.tar.gz \
12-
&& tar xzf nauty29r3.tar.gz \
11+
RUN curl -L -o nauty2_9_3.tar.gz https://users.cecs.anu.edu.au/~bdm/nauty/nauty2_9_3.tar.gz \
12+
&& tar xzf nauty2_9_3.tar.gz \
1313
&& cd nauty2_9_3 \
1414
&& ./configure && make
1515

README.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,22 +84,24 @@ make surge NAUTY=/path/to/nauty NAUTYLIB=/path/to/nauty
8484
```
8585
Or compile directly with gcc:
8686
```
87-
gcc -o surge -O3 -DWORDSIZE=64 -DMAXN=WORDSIZE -DOUTPROC=surgeproc \
88-
-march=native -DPREPRUNE=surgepreprune \
87+
gcc -o surge -O3 -I /path/to/nauty -DWORDSIZE=64 -DMAXN=WORDSIZE \
88+
-DOUTPROC=surgeproc -march=native -DPREPRUNE=surgepreprune \
8989
-DPRUNE=surgeprune -DGENG_MAIN=geng_main \
9090
surge.c geng.c planarity.c /path/to/nautyL1.a
9191
```
9292
You can build-in gzip output using the zlib library (https://zlib.net). Add `-DZLIB` to the compilation, and link with the zlib library either by adding `-lz` or `libz.a`. This will activate the `-z` command to gzip the output:
9393
```
94-
gcc -o surge -O3 -DWORDSIZE=64 -DMAXN=WORDSIZE -DOUTPROC=surgeproc \
95-
-march=native -DPREPRUNE=surgepreprune -DZLIB \
96-
-DPRUNE=surgeprune -DGENG_MAIN=geng_main \
94+
gcc -o surge -O3 -I /path/to/nauty -DWORDSIZE=64 -DMAXN=WORDSIZE \
95+
-DOUTPROC=surgeproc -march=native -DPREPRUNE=surgepreprune \
96+
-DZLIB -DPRUNE=surgeprune -DGENG_MAIN=geng_main \
9797
surge.c geng.c planarity.c /path/to/nautyL1.a -lz
9898
```
9999

100100
**Note for macOS Homebrew users:** If you installed nauty via Homebrew (`brew install nauty`), the library file may be named `libnautyL1.a` rather than `nautyL1.a`. You can create a symlink to make it work with the Makefile:
101101
```
102-
ln -s /opt/homebrew/lib/libnautyL1.a /opt/homebrew/lib/nautyL1.a
102+
NAUTY_LIB=$(brew --prefix nauty)/lib
103+
ln -s "$NAUTY_LIB/libnautyL1.a" "$NAUTY_LIB/nautyL1.a"
104+
make surge NAUTY=$(brew --prefix nauty)/include/nauty NAUTYLIB=$(brew --prefix nauty)/lib
103105
```
104106

105107
### Option 3: Use Docker

0 commit comments

Comments
 (0)