Ubuntu26

CMakeLists.txt

@@ -463,7 +463,7 @@ endif()
 # boost setup
 ############################################
 
-find_package(Boost REQUIRED COMPONENTS system) # filesystem)
+find_package(Boost REQUIRED) #COMPONENTS system) # filesystem)
 
 include_directories(${Boost_INCLUDE_DIRS})
 target_link_libraries(objlib PUBLIC ${Boost_LIBRARIES})

doc/install.dox

@@ -6,10 +6,9 @@
 
 These are instructions for installing the `mxlib` c/c++ library.  This is my personal library which I have built up over
 many years.  Along the way I have tried to keep it organized and documented.  I have installed it on several different
-linux systems (running Rocky or Ubuntu). Installation on Mac O/S is also possible using Conda.
+linux systems (running Rocky, Fedora, or Ubuntu). Installation on Mac O/S is also possible using Conda.
 
-The below instructions were updated in July 2025 after implementing the CMake build system.  The original `make` build
-system still works (July, 2025) but will not be maintained going forward.
+`mxlib` now uses a `CMake` build system, the original `make` build system has been removed.
 
 \section quick_start Quick Start
 
@@ -53,12 +52,12 @@ You will need to make sure to install the `dev` packages.
 -# You need a basic build system:
     -# You need a c compiler supporting C99.
     -# You need a c++17 compatible c++ compiler.  c++20 is preferred and is the default.
-    -# You need `make`
-    -# To use the `cmake`  build system you need `cmake`  and `pkg-config`
+    -# You need `cmake`  and `pkg-config`
 
 -# You need the `boost` c++ system library (this is probably obtainable from the linux distro package manager, fine to install with
    apt or yum).
-  - On Ubuntu you can just install `libboost-system-dev`.
+  - On Ubuntu 26 you can just install `sudo apt install libboost-dev`.
+  - On earlier Ubuntus you can install `libboost-system-dev`.
 
 -# You need the `Eigen` matrix library (http://eigen.tuxfamily.org/index.php).
   - It is best to use `cmake` to configure Eigen and install it. This will ensure that the package config is updated.
@@ -202,46 +201,6 @@ This installs the `myProgram` binary to `$PREFIX/bin`.
 For more complicated applications, you can create a local `Makefile` which specifies the `TARGET` and additional objects with
 `OTHER_OBJS`, and finally includes `MxApp.mk`. See `MxApp.mk` for additional options.
 
-\section The Old Makefile Build System
-
-Configuring the old makefile build system requires editing files in the `mxlib/local` directory. To avoid getting the
-modification warning due to makefile modifications, the only files you should edit during
-installation are the local/Common.mk, local/MxLib.mk, and local/mxApp.mk.  Do not edit these in the mk folder.
-
-\subsection building_make Configuring and Building mxlib
-
-Once you have met all the dependencies:
-
--# clone `mxlib` from https://github.com/jaredmales/mxlib
-
--# If you need to customize the build (e.g. switch the BLAS or FFT library used or modify paths), run `make setup`.
-   This will create three Makefiles in `local/` for you to customize.
-
--# To further configure `mxlib` edit the files in the `local/` directory only.  Some options are:
-  - Any variable set with `?=` in the files in `mk/` can be overridden in the corresponding `local/` one. The files in
-    `local/` are not tracked in git and editing them will not cause compile warnings.
-  - If you want to change the install path from `$HOME` to something else, set `PREFIX=` in `local/Common.mk`.
-  - `USE_BLAS_FROM` can be set to `mkl`, `ATLAS`, or `Accelerate` (macOS only). You may also need to override `BLAS_INCLUDES`,
-    `BLAS_LDFLAGS`, and/or `BLAS_LDLIBS` to set paths and flags. (See `mk/MxApp.mk` for examples.)
-
--# You can also pass config options to make, as in `make PREFIX=/path/to/libs`.
-
--# Build `mxlib` by running `make` at the top level.
-
--# Install `mxlib` with `make install`.  `sudo` may be required depending on the `PREFIX`.  Possibly `sudo -E`.
-
-\subsection building_make_conda Makefile build with Conda
-
-If you have used `conda` to install the dependencies you should set `PREFIX=$CONDA_PREFIX` and `NEED_CUDA=no`.
-It is recommended that you do this in `local/Common.mk` but it can be done on the command line as:
-
-\code{.bash}
-make install PREFIX=$CONDA_PREFIX NEED_CUDA=no
-\endcode
-
-Now `mxlib` headers and libraries are in $CONDA_PREFIX/include and $CONDA_PREFIX/lib and should be found by default as long as "conda activate mxlib_env" is always run after you open a new terminal and before you compile things that use mxlib.
-
-
 
 @}
 */

scripts/milk.sh

@@ -0,0 +1,12 @@
+#symlink milk
+
+#Normally copy this to /etc/profile.d after installing milk and symlinking /usr/local/milk
+
+export PATH="$PATH:/usr/local/milk/bin"
+export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/milk/lib/pkgconfig
+export MILK_SHM_DIR=/milk/shm
+export MILK_ROOT=/opt/MagAOX/source/milk
+export MILK_INSTALLDIR=/usr/local/milk
+
+#/etc/ld.so.conf.d/milk.conf 
+/usr/local/milk/lib/

scripts/mxlib_multipass_basic.bash

@@ -3,7 +3,8 @@
 #################################################################################
 # perform an unattended multipass VM setup for mxlib
 #
-# This does not provision for building mxlib, but does clone the repo to /home/ubuntu/mxlib
+# This does not provision for building mxlib, but does clone the repo to /home/ubuntu/mxlib,
+# so you can log in and run `scripts/mxlib_provision_ubuntu2604.sh`
 #
 # note that you need ~/.ssh/id_ed25519.pub
 #
@@ -13,7 +14,7 @@
 ################################################################################
 
 #basic VM creation
-multipass launch -n mxlib-vm -c 4 -d 20GiB -m 8.0GiB 24.04
+multipass launch -n mxlib-vm -c 4 -d 20GiB -m 8.0GiB 26.04
 
 #install our key
 multipass exec mxlib-vm -- bash -c "echo `cat ~/.ssh/id_ed25519.pub` >> ~/.ssh/authorized_keys"
@@ -27,4 +28,4 @@ multipass stop mxlib-vm
 multipass start mxlib-vm
 
 #get MagAO-X repo
-ssh ubuntu@$(multipass exec mxlib-vm -- hostname -I | awk '{ print $1 }' ) "mkdir Source;cd Source;git clone --depth=1 https://github.com/jaredmales/mxlib.git"
+ssh ubuntu@$(multipass exec mxlib-vm -- hostname -I | awk '{ print $1 }' ) "mkdir Source;cd Source;git clone https://github.com/jaredmales/mxlib.git"

scripts/mxlib_provision_ubuntu2204.sh

@@ -0,0 +1,61 @@
+#!/bin/bash
+set -o pipefail
+# since we care about almost every exit status, check them all. use `|| true` to bypass.
+set -e
+#################################################################################
+# A script to provision an Ubuntu 24.04 machine with mxlib and its dependencies
+# Note: this probably works with 22.04 too
+#
+#
+# Creates a directory called ~Source TODO: make this configurable
+# Switches some repos to dev TODO: make this configurable
+#################################################################################
+
+sudo apt-get install -y \
+    git \
+    make \
+    pkg-config \
+    gcc \
+    g++ \
+    libgsl-dev \
+    libboost-system-dev \
+    libcfitsio-dev \
+    libopenblas-dev \
+    liblapacke-dev \
+    libfftw3-dev \
+    libeigen3-dev
+
+#make sure old cmake is gone and upgrade to latest
+sudo apt purge cmake
+sudo snap install cmake --classic
+hash -r
+
+#get an up-to-date g++ with format
+sudo add-apt-repository ppa:ubuntu-toolchain-r/test
+sudo apt update
+sudo apt install gcc-13 g++-13
+sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 130 --slave /usr/bin/g++ g++ /usr/bin/g++-13   
+
+## Make work directory
+mkdir -p $HOME/Source
+
+
+## mxlib
+cd $HOME/Source
+if [[ ! -d mxlib ]]; then
+    git clone https://github.com/jaredmales/mxlib.git
+fi
+cd mxlib
+git checkout dev
+mkdir -p _build
+cd _build
+cmake ..
+make
+sudo make install
+
+
+
+
+
+
+

scripts/mxlib_provision_ubuntu2604.sh

@@ -0,0 +1,50 @@
+#!/bin/bash
+set -o pipefail
+# since we care about almost every exit status, check them all. use `|| true` to bypass.
+set -e
+#################################################################################
+# A script to provision an Ubuntu 26.04 machine with mxlib and its dependencies
+# This is identical to the 24.04 version.
+#
+# Creates a directory called ~Source TODO: make this configurable
+# Switches some repos to dev TODO: make this configurable
+#################################################################################
+
+sudo apt-get install -y \
+    git \
+    make \
+    cmake \
+    pkg-config \
+    gcc \
+    g++ \
+    libgsl-dev \
+    libboost-system-dev \
+    libcfitsio-dev \
+    libopenblas-dev \
+    liblapacke-dev \
+    libfftw3-dev \
+    libeigen3-dev
+
+## Make work directory
+mkdir -p $HOME/Source
+
+
+## mxlib
+cd $HOME/Source
+if [[ ! -d mxlib ]]; then
+    git clone https://github.com/jaredmales/mxlib.git
+fi
+cd mxlib
+git checkout dev
+mkdir -p _build
+cd _build
+cmake ..
+make
+sudo make install
+
+
+
+
+
+
+