From 1b7c8956b33e64eb71483375d7f37188c77084b5 Mon Sep 17 00:00:00 2001 From: Tim Davis Date: Tue, 31 Oct 2023 11:16:00 -0500 Subject: [PATCH] MATLAB_Tools: comments and file locations --- MATLAB_Tools/SuiteSparseCollection/README.txt | 21 ++++++++++--------- .../SuiteSparseCollection/sslocation.m | 8 +++---- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/MATLAB_Tools/SuiteSparseCollection/README.txt b/MATLAB_Tools/SuiteSparseCollection/README.txt index d3121d677b..f344d5b1cc 100644 --- a/MATLAB_Tools/SuiteSparseCollection/README.txt +++ b/MATLAB_Tools/SuiteSparseCollection/README.txt @@ -1,4 +1,4 @@ -SuiteSparseCollection, Copyright (c) 2006-2019, Timothy A Davis. +SuiteSparseCollection, Copyright (c) 2006-2023, Timothy A Davis. All Rights Reserved. SPDX-License-Identifier: GPL-2.0+ @@ -46,7 +46,6 @@ SuiteSparseCollection: software for managing the SuiteSparse Matrix Collection Requires ssget, CSparse, CHOLMOD, AMD, COLAMD, RBio, and METIS. - -------------------------------------------------------------------------------- Files: -------------------------------------------------------------------------------- @@ -81,12 +80,12 @@ Requires most of SuiteSparse (ssget, CHOLMOD, AMD, COLAMD, CSparse, RBio, and SuiteSparseCollection), and METIS. The location of the primary archive of the collection is -backslash.cse.tamu.edu:/archive/davis/SuiteSparseCollection, +backslash.engr.tamu.edu:/raid/SuiteSparseCollection, which is only accessible to the maintainers of the collection. A local copy of ssget should be installed where the mat, MM, RB, and svd directories are replaced with symbolic links to the directories in -backslash.cse.tamu.edu:/archive/davis/SuiteSparseCollection. The +backslash.engr.tamu.edu:/raid/SuiteSparseCollection. The ssget/files directory should not be a symbolic link. 1) Get the matrix into MATLAB (method depending on how the matrix was @@ -94,13 +93,13 @@ ssget/files directory should not be a symbolic link. written just for that matrix. 2) Add the full matrix name to the end of the file: - backslash:/archive/davis/SuiteSparseCollection/files/ss_listing.txt + backslash:/raid/SuiteSparseCollection/files/ss_listing.txt Each line in the file has the form Group/Name. The line number in ss_listing.txt must match the matrix Problem.id number, and full name must match the Problem.name in the MATLAB struct. 3) Create a new directory - backslash:/archive/davis/SuiteSparseCollection/mat/Group, + backslash:/raid/SuiteSparseCollection/mat/Group, where Group is the new matrix group. Add a README.txt file to this directory, the first line of which is a one-line summary that will appear in the top-level web page for the collection. Skip this step if adding a @@ -123,7 +122,9 @@ ssget/files directory should not be a symbolic link. Problem.b right-hand-side Problem.x solution Problem.notes a char array - Problem.aux auxiliary matrices (contents are problem dependent) + Problem.aux auxiliary matrices (contents are problem dependent). + Sequences of k matrices should be held as cell arrays, + of size k-by-1. Save to a MATLAB mat-file. In the mat directory, do this in MATLAB: @@ -134,7 +135,7 @@ ssget/files directory should not be a symbolic link. save (Problem.name, 'Problem', '-v7.3') ; Move the new *.mat files into - backslash:/raid/SuiteSparseCollection/html//mat/Group. + backslash:/raid/SuiteSparseCollection/html/mat/Group. 5) Compute matrix statistics and extend the ss_index. Do this in MATLAB: @@ -143,7 +144,7 @@ ssget/files directory should not be a symbolic link. where ids is a list of the new matrix id's. Updated ss_index.mat and ssstats.csv files are placed in the current working directory. Move the new ss_index.mat and ssstats.csv files to - backslash:/archive/davis/SuiteSparseCollection/files, + backslash:/raid/SuiteSparseCollection/files, overwriting the old copies there. Also copy them into [path to ssget]/files/ so they will be found by the MATLAB ssget.m. @@ -172,7 +173,7 @@ ssget/files directory should not be a symbolic link. sspages (ids) 8) Make the collection world-readable. In - backslash:/archive/davis/SuiteSparseCollection/ do: + backslash:/raid/SuiteSparseCollection/ do: chmod -R og+rX mat files MM RB diff --git a/MATLAB_Tools/SuiteSparseCollection/sslocation.m b/MATLAB_Tools/SuiteSparseCollection/sslocation.m index 9f3b13d6da..f0e90207ca 100644 --- a/MATLAB_Tools/SuiteSparseCollection/sslocation.m +++ b/MATLAB_Tools/SuiteSparseCollection/sslocation.m @@ -10,9 +10,9 @@ % All Rights Reserved. % SPDX-License-Identifier: GPL-2.0+ -% on backslash.cse.tamu.edu: -topdir = '/archive/davis/SuiteSparseCollection/' ; +% on backslash.engr.tamu.edu: +topdir = '/raid/SuiteSparseCollection/html/' ; -% on hypersparse.cse.tamu.edu: -topdir = '/raid/archive/davis/SuiteSparseCollection/' ; +% on hypersparse.engr.tamu.edu: +topdir = '/raid/SuiteSparseCollection/html/' ;