Feat: noble package

.github/workflows/package.yml

@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        distro: [focal, jammy]
+        distro: [ jammy, noble ]
     env:
       PACKAGECLOUD_REPOSITORY: test
     steps:

.github/workflows/test.yml

@@ -4,7 +4,7 @@ on:
     branches:
       - "*"
   pull_request:
-    types: [opened, reopened]
+    types: [ opened, reopened ]
 
 jobs:
   package:
@@ -13,7 +13,7 @@ jobs:
       fail-fast: false
       matrix:
         # distro: [focal,jammy]
-        distro: ["ubuntu-20.04", "ubuntu-22.04"]
+        distro: [ "ubuntu-22.04", "ubuntu-24.04" ]
     env:
       PACKAGECLOUD_REPOSITORY: test
     steps:

build/Dockerfile

@@ -1,26 +1,29 @@
-ARG DISTRIBUTION=bionic
+ARG DISTRIBUTION=noble
 FROM ubuntu:${DISTRIBUTION}
-MAINTAINER Chris Crook <ccrook@linz.govt.nz>
-ENV DEBIAN_FRONTEND noninteractive
+# MAINTAINER Chris Crook <ccrook@linz.govt.nz>
+ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get -y update 
 RUN ln -fs /usr/share/zoneinfo/Pacific/Auckland /etc/localtime
 RUN apt-get install --no-install-recommends -y \
-     devscripts \
-     build-essential \
-     fakeroot \
-     debhelper \
-     git
+    devscripts \
+    build-essential \
+    fakeroot \
+    debhelper \
+    git
 RUN apt-get install -y \
     g++ \
+    libboost-dev \
     libboost-math-dev \
     libboost-regex-dev \
-    '(libwxgtk3.0-dev|libwxgtk3.0-gtk3-dev)' \
+    libboost-filesystem-dev \
     perl \
     python3 \
     debhelper \
     dpkg-dev \
     devscripts
 
+RUN apt-get install -y libwxgtk3.2-dev || apt-get install -y libwxgtk3.0-gtk3-dev
+
 WORKDIR /home
 # ENTRYPOINT "/scripts/run.sh"
 #CMD cat /dev/null

build/build_package.sh

@@ -7,24 +7,25 @@ fi
 scriptfile=`realpath $0`
 scriptdir=`dirname $scriptfile`
 basedir=`dirname $scriptdir`
+rootdir=`dirname $basedir`
 packagedir=$basedir/debs
 pkgname=linz-snap
 buildimage=snap-builder:$DISTRIBUTION
 
 uid=`id -u`
 gid=`id -g`
 docker run --rm  \
-    -v "$basedir:/home" -u $uid:$gid \
+    -v "$rootdir:/home" -u $uid:$gid \
     $buildimage \
-    bash -c "cd /home/linux && SNAP_BUILD_DIR=/tmp/buildsnap make type=release package"
+    bash -c "cd /home/snap/linux && SNAP_BUILD_DIR=/tmp/buildsnap make type=release package"
 
 # Crude copy to desired location
-debfile=`find $basedir -maxdepth 1 -name $pkgname_*.deb -mmin -1`; 
+debfile=`find $rootdir -maxdepth 1 -name $pkgname_*.deb -mmin -1`; 
 if [ -n "$debfile" -a -f "$debfile" ]; then
   debname=`basename $debfile .deb`
   mkdir -p $packagedir/$DISTRIBUTION
   mv $debfile $packagedir/$DISTRIBUTION/
-  rm $basedir/$debname*
+  rm $rootdir/$debname*
   echo "Package file at $packagedir/$DISTRIBUTION/$debname.deb"
 else
   echo "Package not built"

debian/changelog

@@ -1,36 +1,61 @@
+linz-snap (2.8.8-2) noble; urgency=medium
+
+  * Feature: packaging for noble release
+  * Fix: fix OOM for large networks in snapspec caused by incorrect dense
+    matrix allocation
+  * Performance: KD-tree spatial index for snapspec relative accuracy pair
+    loop; enable with -k flag
+  * Performance: improved cache efficiency and multi-threaded performance
+    for Cholesky inversion in large adjustments
+  * Memory: reduced peak memory usage in snapspec for large adjustments
+
+ -- Chris Crook <ccrook@linz.govt.nz>  Wed, 22 Nov 2026 14:00:00 +1300
+
+linz-snap (2.8.8-1) jammy; urgency=medium
+
+  * Feature: Matrix size included in snapspec output for analysis
+
+ -- Chris Crook <ccrook@linz.govt.nz>  Thu, 30 Nov 2023 14:00:00 +1300
+
+linz-snap (2.8.7-1) jammy; urgency=medium
+
+  * Feature: gps_antenna_height command
+
+ -- Chris Crook <ccrook@linz.govt.nz>  Fri, 24 Nov 2023 14:00:00 +1300
+
 linz-snap (2.8.6-1) jammy; urgency=medium
 
   * Feature: better handling of datafile wild cards in obs modifications
     commands
   * Fix: concord hanging on inputs with unexpected longitudes
 
- -- Chris Crook <ccrook@linz.govt.nz>  Sun 19 Nov 2023 14:00:00 +1300
+ -- Chris Crook <ccrook@linz.govt.nz>  Sun, 19 Nov 2023 14:00:00 +1300
 
 linz-snap (2.8.5-1) jammy; urgency=medium
 
   * Feature: rationalisation of handling of vertical datums in coordsys
   * Feature: improved error messaging for some data file errors
 
- -- Chris Crook <ccrook@linz.govt.nz>  Wed 18 Oct 2023 14:00:00 +1300
+ -- Chris Crook <ccrook@linz.govt.nz>  Wed, 18 Oct 2023 14:00:00 +1300
 
 linz-snap (2.8.4-1) focal; urgency=medium
 
   * Feature - Rationalisation of DMS handling in concord.
 
- -- Chris Crook <ccrook@linz.govt.nz>  Thu 22 Oct 2022 14:00:00 +1300
+ -- Chris Crook <ccrook@linz.govt.nz>  Thu, 22 Oct 2022 14:00:00 +1300
 
 linz-snap (2.8.3-1) focal; urgency=medium
 
   * Feature - Limited support for spaces in file name.  Currently does not include 
     format files (.dtf) and not supported in snap_manager.
 
- -- Chris Crook <ccrook@linz.govt.nz>  Sat 2 Apr 2022 14:00:00 +1300
+ -- Chris Crook <ccrook@linz.govt.nz>  Sat, 2 Apr 2022 14:00:00 +1300
 
 linz-snap (2.8.2-3) focal; urgency=medium
 
   * Fix - missing link debian/linz-snap.link file
 
- -- Chris Crook <ccrook@linz.govt.nz>  Fri 25 Feb 2022 14:00:00 +1300
+ -- Chris Crook <ccrook@linz.govt.nz>  Fri, 25 Feb 2022 14:00:00 +1300
 
 linz-snap (2.8.2-2) focal; urgency=medium
 

debian/compat

@@ -1 +1 @@
-8
+10

debian/control

@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 8.0.0),
     libboost-math-dev,
     libboost-regex-dev,
     libboost-filesystem-dev,
-    libwxgtk3.0-gtk3-dev,
+    libwxgtk3.0-gtk3-dev | libwxgtk3.2-dev,
     python3
 Standards-Version: 3.9.2
 Homepage:
@@ -20,7 +20,7 @@ Architecture: amd64
 Depends: ${shlibs:Depends}, ${misc:Depends},
     perl,
     linz-coordsys,
-    libwxgtk3.0-gtk3-dev,
+    libwxgtk3.0-gtk3-dev | libwxgtk3.2-dev,
 Description: Install LINZ snap software
  Install LINZ snap survey network adjustment software suite.
  Includes snap (run with command runsnap), snap_manager, concord, etc.

debian/rules

@@ -11,3 +11,7 @@
 
 %:
 	dh $@ 
+
+
+override_dh_update_autotools_config:
+	dh_update_autotools_config -Xwxwidgets	

linux/makefile

@@ -83,6 +83,7 @@ SITE2GPSEXE = $(INSTALL)/site2gps
 SNAP_MANAGEREXE = $(INSTALL)/snap_manager
 SNAPADJUSTEXE = $(INSTALL)/snapadjust
 SNAPPLOTEXE = $(INSTALL)/snapplot
+CHANGELOG = ../debian/changelog
 
 INCPATH = $(SRCDIR)/snaplib $(SRCDIR)/snaplib/util $(SRCDIR)/wxutils $(SRCDIR)/snapspec $(SRCDIR)/snap $(SRCDIR) $(SRCDIR)/snaplib/dbl4 $(SRCDIR) $(SRCDIR)/third_party
 
@@ -113,9 +114,9 @@ install: installable all
 	cp -r $(INSTALL)/* $(INSTALLDIR)
 
 package: installable
-	@if  ! ( head -1 debian/changelog | grep -q "($(SNAPVER)-" ) ; then echo "***************************************"; echo "ABORTED: changelog version does not match $(SNAPVER)"; exit 1; fi
+	@if  ! ( head -1 $(CHANGELOG) | grep -q "($(SNAPVER)-" ) ; then echo "***************************************"; echo "ABORTED: changelog version does not match $(SNAPVER)"; exit 1; fi
 	@echo "Building debian package"
-	SNAP_BUILD_DIR=$(builddir) debuild -uc -us -b
+	SNAP_BUILD_DIR=$(builddir) debuild --check-dirname-level=0 -uc -us -b
 else
 install: 
 	@echo "Can only build installation for release version"
@@ -157,7 +158,7 @@ snapadjust: $(SNAPADJUSTEXE) support_files
 
 # Test (command line programs only)
 test: snap_cmd
-	../regression_tests/testall.pl $(RUNTESTFLAGS)
+	../regression_tests/testall.pl $(RUNTESTFLAGS) -e
 
 update_version_date:
 	touch `grep -rl GETVERSION_SET_PROGRAM_DATE ../src`

ms/projects/snap64_install/snap64_install.vdproj

@@ -10106,15 +10106,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:SNAP64"
-        "ProductCode" = "8:{655F1418-2696-439E-A64F-5B93EF08691D}"
-        "PackageCode" = "8:{655F1418-749F-447B-BDC5-05FC1BA8E9C0}"
+        "ProductCode" = "8:{69E9357B-A24C-42ED-8B93-AE057AD94E42}"
+        "PackageCode" = "8:{69E9357B-6463-46A6-9C49-1B21C7B019C4}"
         "UpgradeCode" = "8:{F4B4B49E-2F89-4E88-A4C0-1ABC4DE0F465}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:2.8.7"
+        "ProductVersion" = "8:2.8.8"
         "Manufacturer" = "8:Land Information New Zealand"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:http://www.linz.govt.nz"

ms/projects/snap64_install/uninstall_snap.bat

@@ -1 +1 @@
-@msiexec /uninstall "{655F1418-2696-439E-A64F-5B93EF08691D}"
+@msiexec /uninstall "{69E9357B-A24C-42ED-8B93-AE057AD94E42}"

ms/projects/snap_install/snap_install.vdproj

@@ -3275,15 +3275,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:SNAP"
-        "ProductCode" = "8:{655F1418-00D3-4F9B-85EB-371C7456AD67}"
-        "PackageCode" = "8:{655F1418-6694-408A-B1BA-3577370155E5}"
+        "ProductCode" = "8:{69E9357B-9E25-4F6F-B025-56B6EE559851}"
+        "PackageCode" = "8:{69E9357B-8F72-47E1-B293-CA158571A9FC}"
         "UpgradeCode" = "8:{3219AF83-83AE-414A-AE78-E25619B3120B}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:2.8.7"
+        "ProductVersion" = "8:2.8.8"
         "Manufacturer" = "8:Land Information New Zealand"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:http://www.linz.govt.nz"

ms/projects/snap_install/uninstall_snap.bat

@@ -1 +1 @@
-@msiexec /uninstall "{655F1418-00D3-4F9B-85EB-371C7456AD67}"
+@msiexec /uninstall "{69E9357B-9E25-4F6F-B025-56B6EE559851}"

src/VERSION

@@ -1 +1 @@
-2.8.7
+2.8.8

src/help/help/general/changelog.html

@@ -14,6 +14,32 @@ <h1><a name="change_log"></a>Change log</h1>
 
     <!-- <h2>Pending release</h2> -->
 
+    <h2>Release: Date 23 Nov 2023: 2.8.8</h2>
+
+    <h3>snapspec</h3>
+
+    <p>Enhancement: Minor addition of matrix size in output for analysis of large adjustments.
+    </p>
+
+    <p>Fix: Fixed incorrect dense matrix allocation in snapspec that could cause out-of-memory
+    failures when processing large networks.
+    </p>
+
+    <p>Enhancement: Added optional KD-tree spatial index for the relative accuracy pair loop
+    (enable with the <code>-k</code> command line flag). Reduces pair search time for large
+    networks by avoiding an O(n&sup2;) scan.
+    </p>
+
+    <p>Enhancement: Reduced peak memory usage for large adjustments. The Cholesky decomposition
+    is no longer held in memory alongside the inverted covariance matrix, and relative accuracy
+    status arrays are now stored more compactly.
+    </p>
+
+    <p>Enhancement: Improved multi-threaded performance for Cholesky inversion. Threading now
+    partitions work by row range rather than by column, significantly reducing cache pressure
+    at high thread counts.
+    </p>
+
     <h2>Release: Date 23 Nov 2023: 2.8.7</h2>
 
     <h3>snap</h3>

src/snaplib/snapversion.h

@@ -1 +1 @@
-#define SNAPVERSION "2.8.7"
+#define SNAPVERSION "2.8.8"