From a96564343fc07d6ae056af035b7ffaf5be96eb3c Mon Sep 17 00:00:00 2001 From: "J. Daniel Smith" Date: Tue, 9 Jan 2024 08:23:26 -0500 Subject: [PATCH] use same code for VCL and XIMD "unseq" implementations (#732) * merge in develop/8AMPI_PHSI * Squashed commit of the following: commit c56ac71fcb152d3a802a548b59d90ccc09dfaf83 Author: Dan Smith Date: Wed Dec 8 15:23:00 2021 -0500 merge in develop/SIDD-3.0 * unit-test breaks on Linux * trying to re-enable more unittests * test_valid_six unittests now working * Squashed commit of the following: commit e208dd4d072fd9f18860e84f54d68efdebef49a9 Author: Dan Smith Date: Thu Dec 9 14:41:12 2021 -0500 xml.lite changes from coda-oss commit 169df75cb962580fa63f1be3fbf9189c1fd74915 Author: Dan Smith Date: Wed Dec 8 14:32:37 2021 -0500 latest from coda-oss * trying to get the "french" SICD unit-test working * Squashed commit of the following: commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41 Author: Dan Smith Date: Thu Dec 9 14:51:34 2021 -0500 need updates to Python bindings too commit e208dd4d072fd9f18860e84f54d68efdebef49a9 Author: Dan Smith Date: Thu Dec 9 14:41:12 2021 -0500 xml.lite changes from coda-oss commit 169df75cb962580fa63f1be3fbf9189c1fd74915 Author: Dan Smith Date: Wed Dec 8 14:32:37 2021 -0500 latest from coda-oss * Squashed commit of the following: commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983 Author: Dan Smith Date: Thu Dec 9 15:15:34 2021 -0500 trying to fine the right macro for SWIG commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41 Author: Dan Smith Date: Thu Dec 9 14:51:34 2021 -0500 need updates to Python bindings too commit e208dd4d072fd9f18860e84f54d68efdebef49a9 Author: Dan Smith Date: Thu Dec 9 14:41:12 2021 -0500 xml.lite changes from coda-oss commit 169df75cb962580fa63f1be3fbf9189c1fd74915 Author: Dan Smith Date: Wed Dec 8 14:32:37 2021 -0500 latest from coda-oss * Squashed commit of the following: commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1 Author: Dan Smith Date: Thu Dec 9 16:09:17 2021 -0500 "private" is part of name mangling commit 351a45f61d63e26fbd379516f073876bf5558050 Author: Dan Smith Date: Thu Dec 9 15:54:13 2021 -0500 more xml.lite updates from coda-oss commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983 Author: Dan Smith Date: Thu Dec 9 15:15:34 2021 -0500 trying to fine the right macro for SWIG commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41 Author: Dan Smith Date: Thu Dec 9 14:51:34 2021 -0500 need updates to Python bindings too commit e208dd4d072fd9f18860e84f54d68efdebef49a9 Author: Dan Smith Date: Thu Dec 9 14:41:12 2021 -0500 xml.lite changes from coda-oss commit 169df75cb962580fa63f1be3fbf9189c1fd74915 Author: Dan Smith Date: Wed Dec 8 14:32:37 2021 -0500 latest from coda-oss * option to disable XML validation for SICD too * add overloads for other code * Squashed commit of the following: commit f21f79d3f494e1ca8a5236e95ff5503fdb04e43b Author: Dan Smith Date: Thu Dec 9 17:36:09 2021 -0500 test_xmlParser might be be running in coda-oss commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1 Author: Dan Smith Date: Thu Dec 9 16:09:17 2021 -0500 "private" is part of name mangling commit 351a45f61d63e26fbd379516f073876bf5558050 Author: Dan Smith Date: Thu Dec 9 15:54:13 2021 -0500 more xml.lite updates from coda-oss commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983 Author: Dan Smith Date: Thu Dec 9 15:15:34 2021 -0500 trying to fine the right macro for SWIG commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41 Author: Dan Smith Date: Thu Dec 9 14:51:34 2021 -0500 need updates to Python bindings too commit e208dd4d072fd9f18860e84f54d68efdebef49a9 Author: Dan Smith Date: Thu Dec 9 14:41:12 2021 -0500 xml.lite changes from coda-oss commit 169df75cb962580fa63f1be3fbf9189c1fd74915 Author: Dan Smith Date: Wed Dec 8 14:32:37 2021 -0500 latest from coda-oss * still can't get French XML working * Squashed commit of the following: commit c9c0ec36cff6ab97ca5c03c3db712794fb511e6e Author: Dan Smith Date: Mon Dec 13 11:45:39 2021 -0500 Squashed commit of the following: commit 33bd17059640d2a02f9766285f05dcdff5de50a8 Author: Dan Smith Date: Mon Dec 13 11:44:54 2021 -0500 nitro release 2.10.7 commit ef19ad2033851682eb3a37bada3a57fcb2b93ef8 Author: Dan Smith Date: Mon Dec 13 11:42:09 2021 -0500 coda-oss release 2021-12-13 commit 86c1856021a5a944c464f9d3cba397a918f68a81 Author: Dan Smith Date: Fri Dec 10 11:57:26 2021 -0500 xml.lite tweaks from coda-oss commit f21f79d3f494e1ca8a5236e95ff5503fdb04e43b Author: Dan Smith Date: Thu Dec 9 17:36:09 2021 -0500 test_xmlParser might be be running in coda-oss commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1 Author: Dan Smith Date: Thu Dec 9 16:09:17 2021 -0500 "private" is part of name mangling commit 351a45f61d63e26fbd379516f073876bf5558050 Author: Dan Smith Date: Thu Dec 9 15:54:13 2021 -0500 more xml.lite updates from coda-oss commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983 Author: Dan Smith Date: Thu Dec 9 15:15:34 2021 -0500 trying to fine the right macro for SWIG commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41 Author: Dan Smith Date: Thu Dec 9 14:51:34 2021 -0500 need updates to Python bindings too commit e208dd4d072fd9f18860e84f54d68efdebef49a9 Author: Dan Smith Date: Thu Dec 9 14:41:12 2021 -0500 xml.lite changes from coda-oss commit 169df75cb962580fa63f1be3fbf9189c1fd74915 Author: Dan Smith Date: Wed Dec 8 14:32:37 2021 -0500 latest from coda-oss commit 1a74d4046085b286d6b0ae02bc62df608fc70ffa Author: Dan Smith Date: Fri Dec 10 12:26:10 2021 -0500 more use of new xml.lite infrastructure commit 5d641a46f254f78f1e8a03c11f35f2f73c54ed5a Author: Dan Smith Date: Fri Dec 10 11:58:22 2021 -0500 use new xml.lite APIs to simplify code commit 01f811e622eb3b8fcb7f20d8cba8c2d384894b31 Author: Dan Smith Date: Fri Dec 10 11:57:57 2021 -0500 Squashed commit of the following: commit 86c1856021a5a944c464f9d3cba397a918f68a81 Author: Dan Smith Date: Fri Dec 10 11:57:26 2021 -0500 xml.lite tweaks from coda-oss commit f21f79d3f494e1ca8a5236e95ff5503fdb04e43b Author: Dan Smith Date: Thu Dec 9 17:36:09 2021 -0500 test_xmlParser might be be running in coda-oss commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1 Author: Dan Smith Date: Thu Dec 9 16:09:17 2021 -0500 "private" is part of name mangling commit 351a45f61d63e26fbd379516f073876bf5558050 Author: Dan Smith Date: Thu Dec 9 15:54:13 2021 -0500 more xml.lite updates from coda-oss commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983 Author: Dan Smith Date: Thu Dec 9 15:15:34 2021 -0500 trying to fine the right macro for SWIG commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41 Author: Dan Smith Date: Thu Dec 9 14:51:34 2021 -0500 need updates to Python bindings too commit e208dd4d072fd9f18860e84f54d68efdebef49a9 Author: Dan Smith Date: Thu Dec 9 14:41:12 2021 -0500 xml.lite changes from coda-oss commit 169df75cb962580fa63f1be3fbf9189c1fd74915 Author: Dan Smith Date: Wed Dec 8 14:32:37 2021 -0500 latest from coda-oss commit 25b83eb24e0ebf095522df47349e7c5fbf1df8e3 Author: Dan Smith Date: Fri Dec 10 09:06:38 2021 -0500 Squashed commit of the following: commit 3f59a6260e33423c21326dde8e5bed7dc93cd9f0 Author: Dan Smith Date: Fri Dec 10 08:44:54 2021 -0500 still can't get French XML working commit 1a826e5c300d0e2781a015d1916eba8556a36c2d Author: Dan Smith Date: Thu Dec 9 17:37:11 2021 -0500 Squashed commit of the following: commit f21f79d3f494e1ca8a5236e95ff5503fdb04e43b Author: Dan Smith Date: Thu Dec 9 17:36:09 2021 -0500 test_xmlParser might be be running in coda-oss commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1 Author: Dan Smith Date: Thu Dec 9 16:09:17 2021 -0500 "private" is part of name mangling commit 351a45f61d63e26fbd379516f073876bf5558050 Author: Dan Smith Date: Thu Dec 9 15:54:13 2021 -0500 more xml.lite updates from coda-oss commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983 Author: Dan Smith Date: Thu Dec 9 15:15:34 2021 -0500 trying to fine the right macro for SWIG commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41 Author: Dan Smith Date: Thu Dec 9 14:51:34 2021 -0500 need updates to Python bindings too commit e208dd4d072fd9f18860e84f54d68efdebef49a9 Author: Dan Smith Date: Thu Dec 9 14:41:12 2021 -0500 xml.lite changes from coda-oss commit 169df75cb962580fa63f1be3fbf9189c1fd74915 Author: Dan Smith Date: Wed Dec 8 14:32:37 2021 -0500 latest from coda-oss commit f705be9129ea7c71d6bdc25899b53fd3f655b974 Author: Dan Smith Date: Thu Dec 9 17:35:35 2021 -0500 add overloads for other code commit d61323431bea6e33c4f91b60cb83f3401b76671d Author: Dan Smith Date: Thu Dec 9 16:57:55 2021 -0500 option to disable XML validation for SICD too commit bc2c97e9f79ce91f2dc0ce9b3d5e45a7e60a852b Author: Dan Smith Date: Thu Dec 9 16:09:44 2021 -0500 Squashed commit of the following: commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1 Author: Dan Smith Date: Thu Dec 9 16:09:17 2021 -0500 "private" is part of name mangling commit 351a45f61d63e26fbd379516f073876bf5558050 Author: Dan Smith Date: Thu Dec 9 15:54:13 2021 -0500 more xml.lite updates from coda-oss commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983 Author: Dan Smith Date: Thu Dec 9 15:15:34 2021 -0500 trying to fine the right macro for SWIG commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41 Author: Dan Smith Date: Thu Dec 9 14:51:34 2021 -0500 need updates to Python bindings too commit e208dd4d072fd9f18860e84f54d68efdebef49a9 Author: Dan Smith Date: Thu Dec 9 14:41:12 2021 -0500 xml.lite changes from coda-oss commit 169df75cb962580fa63f1be3fbf9189c1fd74915 Author: Dan Smith Date: Wed Dec 8 14:32:37 2021 -0500 latest from coda-oss commit 4cd813b2f115cd2446821bf01dcf7d8c27781322 Author: Dan Smith Date: Thu Dec 9 15:16:01 2021 -0500 Squashed commit of the following: commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983 Author: Dan Smith Date: Thu Dec 9 15:15:34 2021 -0500 trying to fine the right macro for SWIG commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41 Author: Dan Smith Date: Thu Dec 9 14:51:34 2021 -0500 need updates to Python bindings too commit e208dd4d072fd9f18860e84f54d68efdebef49a9 Author: Dan Smith Date: Thu Dec 9 14:41:12 2021 -0500 xml.lite changes from coda-oss commit 169df75cb962580fa63f1be3fbf9189c1fd74915 Author: Dan Smith Date: Wed Dec 8 14:32:37 2021 -0500 latest from coda-oss commit 7b210f96d175c35dd4d93a8ede3b1127b6fe442c Author: Dan Smith Date: Thu Dec 9 14:51:53 2021 -0500 Squashed commit of the following: commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41 Author: Dan Smith Date: Thu Dec 9 14:51:34 2021 -0500 need updates to Python bindings too commit e208dd4d072fd9f18860e84f54d68efdebef49a9 Author: Dan Smith Date: Thu Dec 9 14:41:12 2021 -0500 xml.lite changes from coda-oss commit 169df75cb962580fa63f1be3fbf9189c1fd74915 Author: Dan Smith Date: Wed Dec 8 14:32:37 2021 -0500 latest from coda-oss commit 4a4d621a17bb568fa07453a6a06f08f34efb7b73 Author: Dan Smith Date: Thu Dec 9 14:47:21 2021 -0500 trying to get the "french" SICD unit-test working commit d63e6eace772c8d02616f467d698da48a14568dd Author: Dan Smith Date: Thu Dec 9 14:42:55 2021 -0500 Squashed commit of the following: commit e208dd4d072fd9f18860e84f54d68efdebef49a9 Author: Dan Smith Date: Thu Dec 9 14:41:12 2021 -0500 xml.lite changes from coda-oss commit 169df75cb962580fa63f1be3fbf9189c1fd74915 Author: Dan Smith Date: Wed Dec 8 14:32:37 2021 -0500 latest from coda-oss commit d1a7e6f442aff2530a7fd8078b88a56ce050238f Author: Dan Smith Date: Thu Dec 9 09:29:07 2021 -0500 test_valid_six unittests now working commit d6fb257c92ab8e97e2d2a2164484011c60d2c95d Author: Dan Smith Date: Wed Dec 8 17:45:26 2021 -0500 trying to re-enable more unittests commit c787e98a7f339740389e10f5c5cb3760617f3ed1 Author: Dan Smith Date: Wed Dec 8 16:54:28 2021 -0500 unit-test breaks on Linux commit bd82787be8ae4f4cd463faa2bb6d2cb5c6d7dba6 Author: Dan Smith Date: Wed Dec 8 15:25:31 2021 -0500 Squashed commit of the following: commit c56ac71fcb152d3a802a548b59d90ccc09dfaf83 Author: Dan Smith Date: Wed Dec 8 15:23:00 2021 -0500 merge in develop/SIDD-3.0 commit e621466a38f21d5b66847f5358b4def1fd4ea4ce Author: Dan Smith Date: Wed Dec 8 15:08:04 2021 -0500 merge in develop/8AMPI_PHSI commit 67768ea901bbd983becc4790b478afe0f17828d5 Author: Dan Smith Date: Thu Dec 9 10:02:19 2021 -0500 Squashed commit of the following: commit d1a7e6f442aff2530a7fd8078b88a56ce050238f Author: Dan Smith Date: Thu Dec 9 09:29:07 2021 -0500 test_valid_six unittests now working commit d6fb257c92ab8e97e2d2a2164484011c60d2c95d Author: Dan Smith Date: Wed Dec 8 17:45:26 2021 -0500 trying to re-enable more unittests commit c787e98a7f339740389e10f5c5cb3760617f3ed1 Author: Dan Smith Date: Wed Dec 8 16:54:28 2021 -0500 unit-test breaks on Linux commit bd82787be8ae4f4cd463faa2bb6d2cb5c6d7dba6 Author: Dan Smith Date: Wed Dec 8 15:25:31 2021 -0500 Squashed commit of the following: commit c56ac71fcb152d3a802a548b59d90ccc09dfaf83 Author: Dan Smith Date: Wed Dec 8 15:23:00 2021 -0500 merge in develop/SIDD-3.0 commit e621466a38f21d5b66847f5358b4def1fd4ea4ce Author: Dan Smith Date: Wed Dec 8 15:08:04 2021 -0500 merge in develop/8AMPI_PHSI commit b582c055ba1f0f2532d2f5ad4c97b3cd649e69bd Author: Dan Smith Date: Wed Dec 8 15:26:24 2021 -0500 Squashed commit of the following: commit bd82787be8ae4f4cd463faa2bb6d2cb5c6d7dba6 Author: Dan Smith Date: Wed Dec 8 15:25:31 2021 -0500 Squashed commit of the following: commit c56ac71fcb152d3a802a548b59d90ccc09dfaf83 Author: Dan Smith Date: Wed Dec 8 15:23:00 2021 -0500 merge in develop/SIDD-3.0 commit e621466a38f21d5b66847f5358b4def1fd4ea4ce Author: Dan Smith Date: Wed Dec 8 15:08:04 2021 -0500 merge in develop/8AMPI_PHSI commit c56ac71fcb152d3a802a548b59d90ccc09dfaf83 Author: Dan Smith Date: Wed Dec 8 15:23:00 2021 -0500 merge in develop/SIDD-3.0 * Squashed commit of the following: commit 474b7f2dc37eaa3144b97be8f785911ace32eb4d Author: Dan Smith Date: Mon Dec 13 13:00:02 2021 -0500 xml.lite changes that need to get back to coda-oss commit c9c0ec36cff6ab97ca5c03c3db712794fb511e6e Author: Dan Smith Date: Mon Dec 13 11:45:39 2021 -0500 Squashed commit of the following: commit 33bd17059640d2a02f9766285f05dcdff5de50a8 Author: Dan Smith Date: Mon Dec 13 11:44:54 2021 -0500 nitro release 2.10.7 commit ef19ad2033851682eb3a37bada3a57fcb2b93ef8 Author: Dan Smith Date: Mon Dec 13 11:42:09 2021 -0500 coda-oss release 2021-12-13 commit 86c1856021a5a944c464f9d3cba397a918f68a81 Author: Dan Smith Date: Fri Dec 10 11:57:26 2021 -0500 xml.lite tweaks from coda-oss commit f21f79d3f494e1ca8a5236e95ff5503fdb04e43b Author: Dan Smith Date: Thu Dec 9 17:36:09 2021 -0500 test_xmlParser might be be running in coda-oss commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1 Author: Dan Smith Date: Thu Dec 9 16:09:17 2021 -0500 "private" is part of name mangling commit 351a45f61d63e26fbd379516f073876bf5558050 Author: Dan Smith Date: Thu Dec 9 15:54:13 2021 -0500 more xml.lite updates from coda-oss commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983 Author: Dan Smith Date: Thu Dec 9 15:15:34 2021 -0500 trying to fine the right macro for SWIG commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41 Author: Dan Smith Date: Thu Dec 9 14:51:34 2021 -0500 need updates to Python bindings too commit e208dd4d072fd9f18860e84f54d68efdebef49a9 Author: Dan Smith Date: Thu Dec 9 14:41:12 2021 -0500 xml.lite changes from coda-oss commit 169df75cb962580fa63f1be3fbf9189c1fd74915 Author: Dan Smith Date: Wed Dec 8 14:32:37 2021 -0500 latest from coda-oss commit 1a74d4046085b286d6b0ae02bc62df608fc70ffa Author: Dan Smith Date: Fri Dec 10 12:26:10 2021 -0500 more use of new xml.lite infrastructure commit 5d641a46f254f78f1e8a03c11f35f2f73c54ed5a Author: Dan Smith Date: Fri Dec 10 11:58:22 2021 -0500 use new xml.lite APIs to simplify code commit 01f811e622eb3b8fcb7f20d8cba8c2d384894b31 Author: Dan Smith Date: Fri Dec 10 11:57:57 2021 -0500 Squashed commit of the following: commit 86c1856021a5a944c464f9d3cba397a918f68a81 Author: Dan Smith Date: Fri Dec 10 11:57:26 2021 -0500 xml.lite tweaks from coda-oss commit f21f79d3f494e1ca8a5236e95ff5503fdb04e43b Author: Dan Smith Date: Thu Dec 9 17:36:09 2021 -0500 test_xmlParser might be be running in coda-oss commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1 Author: Dan Smith Date: Thu Dec 9 16:09:17 2021 -0500 "private" is part of name mangling commit 351a45f61d63e26fbd379516f073876bf5558050 Author: Dan Smith Date: Thu Dec 9 15:54:13 2021 -0500 more xml.lite updates from coda-oss commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983 Author: Dan Smith Date: Thu Dec 9 15:15:34 2021 -0500 trying to fine the right macro for SWIG commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41 Author: Dan Smith Date: Thu Dec 9 14:51:34 2021 -0500 need updates to Python bindings too commit e208dd4d072fd9f18860e84f54d68efdebef49a9 Author: Dan Smith Date: Thu Dec 9 14:41:12 2021 -0500 xml.lite changes from coda-oss commit 169df75cb962580fa63f1be3fbf9189c1fd74915 Author: Dan Smith Date: Wed Dec 8 14:32:37 2021 -0500 latest from coda-oss commit 25b83eb24e0ebf095522df47349e7c5fbf1df8e3 Author: Dan Smith Date: Fri Dec 10 09:06:38 2021 -0500 Squashed commit of the following: commit 3f59a6260e33423c21326dde8e5bed7dc93cd9f0 Author: Dan Smith Date: Fri Dec 10 08:44:54 2021 -0500 still can't get French XML working commit 1a826e5c300d0e2781a015d1916eba8556a36c2d Author: Dan Smith Date: Thu Dec 9 17:37:11 2021 -0500 Squashed commit of the following: commit f21f79d3f494e1ca8a5236e95ff5503fdb04e43b Author: Dan Smith Date: Thu Dec 9 17:36:09 2021 -0500 test_xmlParser might be be running in coda-oss commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1 Author: Dan Smith Date: Thu Dec 9 16:09:17 2021 -0500 "private" is part of name mangling commit 351a45f61d63e26fbd379516f073876bf5558050 Author: Dan Smith Date: Thu Dec 9 15:54:13 2021 -0500 more xml.lite updates from coda-oss commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983 Author: Dan Smith Date: Thu Dec 9 15:15:34 2021 -0500 trying to fine the right macro for SWIG commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41 Author: Dan Smith Date: Thu Dec 9 14:51:34 2021 -0500 need updates to Python bindings too commit e208dd4d072fd9f18860e84f54d68efdebef49a9 Author: Dan Smith Date: Thu Dec 9 14:41:12 2021 -0500 xml.lite changes from coda-oss commit 169df75cb962580fa63f1be3fbf9189c1fd74915 Author: Dan Smith Date: Wed Dec 8 14:32:37 2021 -0500 latest from coda-oss commit f705be9129ea7c71d6bdc25899b53fd3f655b974 Author: Dan Smith Date: Thu Dec 9 17:35:35 2021 -0500 add overloads for other code commit d61323431bea6e33c4f91b60cb83f3401b76671d Author: Dan Smith Date: Thu Dec 9 16:57:55 2021 -0500 option to disable XML validation for SICD too commit bc2c97e9f79ce91f2dc0ce9b3d5e45a7e60a852b Author: Dan Smith Date: Thu Dec 9 16:09:44 2021 -0500 Squashed commit of the following: commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1 Author: Dan Smith Date: Thu Dec 9 16:09:17 2021 -0500 "private" is part of name mangling commit 351a45f61d63e26fbd379516f073876bf5558050 Author: Dan Smith Date: Thu Dec 9 15:54:13 2021 -0500 more xml.lite updates from coda-oss commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983 Author: Dan Smith Date: Thu Dec 9 15:15:34 2021 -0500 trying to fine the right macro for SWIG commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41 Author: Dan Smith Date: Thu Dec 9 14:51:34 2021 -0500 need updates to Python bindings too commit e208dd4d072fd9f18860e84f54d68efdebef49a9 Author: Dan Smith Date: Thu Dec 9 14:41:12 2021 -0500 xml.lite changes from coda-oss commit 169df75cb962580fa63f1be3fbf9189c1fd74915 Author: Dan Smith Date: Wed Dec 8 14:32:37 2021 -0500 latest from coda-oss commit 4cd813b2f115cd2446821bf01dcf7d8c27781322 Author: Dan Smith Date: Thu Dec 9 15:16:01 2021 -0500 Squashed commit of the following: commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983 Author: Dan Smith Date: Thu Dec 9 15:15:34 2021 -0500 trying to fine the right macro for SWIG commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41 Author: Dan Smith Date: Thu Dec 9 14:51:34 2021 -0500 need updates to Python bindings too commit e208dd4d072fd9f18860e84f54d68efdebef49a9 Author: Dan Smith Date: Thu Dec 9 14:41:12 2021 -0500 xml.lite changes from coda-oss commit 169df75cb962580fa63f1be3fbf9189c1fd74915 Author: Dan Smith Date: Wed Dec 8 14:32:37 2021 -0500 latest from coda-oss commit 7b210f96d175c35dd4d93a8ede3b1127b6fe442c Author: Dan Smith Date: Thu Dec 9 14:51:53 2021 -0500 Squashed commit of the following: commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41 Author: Dan Smith Date: Thu Dec 9 14:51:34 2021 -0500 need updates to Python bindings too commit e208dd4d072fd9f18860e84f54d68efdebef49a9 Author: Dan Smith Date: Thu Dec 9 14:41:12 2021 -0500 xml.lite changes from coda-oss commit 169df75cb962580fa63f1be3fbf9189c1fd74915 Author: Dan Smith Date: Wed Dec 8 14:32:37 2021 -0500 latest from coda-oss commit 4a4d621a17bb568fa07453a6a06f08f34efb7b73 Author: Dan Smith Date: Thu Dec 9 14:47:21 2021 -0500 trying to get the "french" SICD unit-test working commit d63e6eace772c8d02616f467d698da48a14568dd Author: Dan Smith Date: Thu Dec 9 14:42:55 2021 -0500 Squashed commit of the following: commit e208dd4d072fd9f18860e84f54d68efdebef49a9 Author: Dan Smith Date: Thu Dec 9 14:41:12 2021 -0500 xml.lite changes from coda-oss commit 169df75cb962580fa63f1be3fbf9189c1fd74915 Author: Dan Smith Date: Wed Dec 8 14:32:37 2021 -0500 latest from coda-oss commit d1a7e6f442aff2530a7fd8078b88a56ce050238f Author: Dan Smith Date: Thu Dec 9 09:29:07 2021 -0500 test_valid_six unittests now working commit d6fb257c92ab8e97e2d2a2164484011c60d2c95d Author: Dan Smith Date: Wed Dec 8 17:45:26 2021 -0500 trying to re-enable more unittests commit c787e98a7f339740389e10f5c5cb3760617f3ed1 Author: Dan Smith Date: Wed Dec 8 16:54:28 2021 -0500 unit-test breaks on Linux commit bd82787be8ae4f4cd463faa2bb6d2cb5c6d7dba6 Author: Dan Smith Date: Wed Dec 8 15:25:31 2021 -0500 Squashed commit of the following: commit c56ac71fcb152d3a802a548b59d90ccc09dfaf83 Author: Dan Smith Date: Wed Dec 8 15:23:00 2021 -0500 merge in develop/SIDD-3.0 commit e621466a38f21d5b66847f5358b4def1fd4ea4ce Author: Dan Smith Date: Wed Dec 8 15:08:04 2021 -0500 merge in develop/8AMPI_PHSI commit 67768ea901bbd983becc4790b478afe0f17828d5 Author: Dan Smith Date: Thu Dec 9 10:02:19 2021 -0500 Squashed commit of the following: commit d1a7e6f442aff2530a7fd8078b88a56ce050238f Author: Dan Smith Date: Thu Dec 9 09:29:07 2021 -0500 test_valid_six unittests now working commit d6fb257c92ab8e97e2d2a2164484011c60d2c95d Author: Dan Smith Date: Wed Dec 8 17:45:26 2021 -0500 trying to re-enable more unittests commit c787e98a7f339740389e10f5c5cb3760617f3ed1 Author: Dan Smith Date: Wed Dec 8 16:54:28 2021 -0500 unit-test breaks on Linux commit bd82787be8ae4f4cd463faa2bb6d2cb5c6d7dba6 Author: Dan Smith Date: Wed Dec 8 15:25:31 2021 -0500 Squashed commit of the following: commit c56ac71fcb152d3a802a548b59d90ccc09dfaf83 Author: Dan Smith Date: Wed Dec 8 15:23:00 2021 -0500 merge in develop/SIDD-3.0 commit e621466a38f21d5b66847f5358b4def1fd4ea4ce Author: Dan Smith Date: Wed Dec 8 15:08:04 2021 -0500 merge in develop/8AMPI_PHSI commit b582c055ba1f0f2532d2f5ad4c97b3cd649e69bd Author: Dan Smith Date: Wed Dec 8 15:26:24 2021 -0500 Squashed commit of the following: commit bd82787be8ae4f4cd463faa2bb6d2cb5c6d7dba6 Author: Dan Smith Date: Wed Dec 8 15:25:31 2021 -0500 Squashed commit of the following: commit c56ac71fcb152d3a802a548b59d90ccc09dfaf83 Author: Dan Smith Date: Wed Dec 8 15:23:00 2021 -0500 merge in develop/SIDD-3.0 commit e621466a38f21d5b66847f5358b4def1fd4ea4ce Author: Dan Smith Date: Wed Dec 8 15:08:04 2021 -0500 merge in develop/8AMPI_PHSI commit c56ac71fcb152d3a802a548b59d90ccc09dfaf83 Author: Dan Smith Date: Wed Dec 8 15:23:00 2021 -0500 merge in develop/SIDD-3.0 * Squashed commit of the following: commit ec79f1c0aac15ee0b36ed865b341f5d65e8ae0dd Author: Dan Smith Date: Mon Jan 3 11:12:43 2022 -0500 latest from coda-oss commit 22df5a95a3cbc3128780c63114a90181b4af33f8 Merge: db052a2d7 f1f19bdb6 Author: Dan Smith Date: Wed Dec 29 12:25:28 2021 -0500 Merge branch 'master' into develop/update-externals commit db052a2d7bc7db05a9ccadcc5e1554275334bd9c Author: Dan Smith Date: Wed Dec 29 09:17:08 2021 -0500 adjust for coda-oss changes commit 74ce242cf352a333684379cc9bd0278c0cf57571 Author: Dan Smith Date: Wed Dec 29 09:01:34 2021 -0500 latest from coda-oss commit dc960f74d430442cd3359b8218ad9d9a144bd070 Author: Dan Smith Date: Tue Dec 28 10:37:48 2021 -0500 latest from coda-oss commit c6a4bd5b900d83b3407f8793cc756f46965700f4 Author: Dan Smith Date: Fri Dec 17 09:14:23 2021 -0500 sanity-check a URI commit 82b1f21388dbf0f1b3e402ffaf151421d11149b8 Author: Dan Smith Date: Wed Dec 15 09:38:14 2021 -0500 create a "path" after splitting on ":" commit 01cf2b5cadc18b97ac3a51bde9786b519755b1b1 Author: Dan Smith Date: Wed Dec 15 08:50:17 2021 -0500 simple URI validation commit 3610f8e6e0f11a643831280819efb0aff3bb373d Author: Dan Smith Date: Tue Dec 14 09:46:21 2021 -0500 xml.lite tweaks from coda-oss commit 813be14c563d9f4829d342ec008b86da5ef77b27 Merge: 873d4b9d6 9ed21bed3 Author: Dan Smith Date: Mon Dec 13 17:25:22 2021 -0500 Merge branch 'master' into develop/update-externals commit 873d4b9d6c55ae2736fc6208ece14aecf67adf10 Merge: 1c1a7222c ef191da2f Author: Dan Smith Date: Mon Dec 13 13:59:08 2021 -0500 Merge branch 'master' into develop/update-externals commit 1c1a7222c527f5ae89b9c960eb9c3fa9f2ccefa4 Author: Dan Smith Date: Mon Dec 13 13:01:14 2021 -0500 Squashed commit of the following: commit 474b7f2dc37eaa3144b97be8f785911ace32eb4d Author: Dan Smith Date: Mon Dec 13 13:00:02 2021 -0500 xml.lite changes that need to get back to coda-oss commit c9c0ec36cff6ab97ca5c03c3db712794fb511e6e Author: Dan Smith Date: Mon Dec 13 11:45:39 2021 -0500 Squashed commit of the following: commit 33bd17059640d2a02f9766285f05dcdff5de50a8 Author: Dan Smith Date: Mon Dec 13 11:44:54 2021 -0500 nitro release 2.10.7 commit ef19ad2033851682eb3a37bada3a57fcb2b93ef8 Author: Dan Smith Date: Mon Dec 13 11:42:09 2021 -0500 coda-oss release 2021-12-13 commit 86c1856021a5a944c464f9d3cba397a918f68a81 Author: Dan Smith Date: Fri Dec 10 11:57:26 2021 -0500 xml.lite tweaks from coda-oss commit f21f79d3f494e1ca8a5236e95ff5503fdb04e43b Author: Dan Smith Date: Thu Dec 9 17:36:09 2021 -0500 test_xmlParser might be be running in coda-oss commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1 Author: Dan Smith Date: Thu Dec 9 16:09:17 2021 -0500 "private" is part of name mangling commit 351a45f61d63e26fbd379516f073876bf5558050 Author: Dan Smith Date: Thu Dec 9 15:54:13 2021 -0500 more xml.lite updates from coda-oss commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983 Author: Dan Smith Date: Thu Dec 9 15:15:34 2021 -0500 trying to fine the right macro for SWIG commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41 Author: Dan Smith Date: Thu Dec 9 14:51:34 2021 -0500 need updates to Python bindings too commit e208dd4d072fd9f18860e84f54d68efdebef49a9 Author: Dan Smith Date: Thu Dec 9 14:41:12 2021 -0500 xml.lite changes from coda-oss commit 169df75cb962580fa63f1be3fbf9189c1fd74915 Author: Dan Smith Date: Wed Dec 8 14:32:37 2021 -0500 latest from coda-oss commit 1a74d4046085b286d6b0ae02bc62df608fc70ffa Author: Dan Smith Date: Fri Dec 10 12:26:10 2021 -0500 more use of new xml.lite infrastructure commit 5d641a46f254f78f1e8a03c11f35f2f73c54ed5a Author: Dan Smith Date: Fri Dec 10 11:58:22 2021 -0500 use new xml.lite APIs to simplify code commit 01f811e622eb3b8fcb7f20d8cba8c2d384894b31 Author: Dan Smith Date: Fri Dec 10 11:57:57 2021 -0500 Squashed commit of the following: commit 86c1856021a5a944c464f9d3cba397a918f68a81 Author: Dan Smith Date: Fri Dec 10 11:57:26 2021 -0500 xml.lite tweaks from coda-oss commit f21f79d3f494e1ca8a5236e95ff5503fdb04e43b Author: Dan Smith Date: Thu Dec 9 17:36:09 2021 -0500 test_xmlParser might be be running in coda-oss commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1 Author: Dan Smith Date: Thu Dec 9 16:09:17 2021 -0500 "private" is part of name mangling commit 351a45f61d63e26fbd379516f073876bf5558050 Author: Dan Smith Date: Thu Dec 9 15:54:13 2021 -0500 more xml.lite updates from coda-oss commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983 Author: Dan Smith Date: Thu Dec 9 15:15:34 2021 -0500 trying to fine the right macro for SWIG commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41 Author: Dan Smith Date: Thu Dec 9 14:51:34 2021 -0500 need updates to Python bindings too commit e208dd4d072fd9f18860e84f54d68efdebef49a9 Author: Dan Smith Date: Thu Dec 9 14:41:12 2021 -0500 xml.lite changes from coda-oss commit 169df75cb962580fa63f1be3fbf9189c1fd74915 Author: Dan Smith Date: Wed Dec 8 14:32:37 2021 -0500 latest from coda-oss commit 25b83eb24e0ebf095522df47349e7c5fbf1df8e3 Author: Dan Smith Date: Fri Dec 10 09:06:38 2021 -0500 Squashed commit of the following: commit 3f59a6260e33423c21326dde8e5bed7dc93cd9f0 Author: Dan Smith Date: Fri Dec 10 08:44:54 2021 -0500 still can't get French XML working commit 1a826e5c300d0e2781a015d1916eba8556a36c2d Author: Dan Smith Date: Thu Dec 9 17:37:11 2021 -0500 Squashed commit of the following: commit f21f79d3f494e1ca8a5236e95ff5503fdb04e43b Author: Dan Smith Date: Thu Dec 9 17:36:09 2021 -0500 test_xmlParser might be be running in coda-oss commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1 Author: Dan Smith Date: Thu Dec 9 16:09:17 2021 -0500 "private" is part of name mangling commit 351a45f61d63e26fbd379516f073876bf5558050 Author: Dan Smith Date: Thu Dec 9 15:54:13 2021 -0500 more xml.lite updates from coda-oss commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983 Author: Dan Smith Date: Thu Dec 9 15:15:34 2021 -0500 trying to fine the right macro for SWIG commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41 Author: Dan Smith Date: Thu Dec 9 14:51:34 2021 -0500 need updates to Python bindings too commit e208dd4d072fd9f18860e84f54d68efdebef49a9 Author: Dan Smith Date: Thu Dec 9 14:41:12 2021 -0500 xml.lite changes from coda-oss commit 169df75cb962580fa63f1be3fbf9189c1fd74915 Author: Dan Smith Date: Wed Dec 8 14:32:37 2021 -0500 latest from coda-oss commit f705be9129ea7c71d6bdc25899b53fd3f655b974 Author: Dan Smith Date: Thu Dec 9 17:35:35 2021 -0500 add overloads for other code commit d61323431bea6e33c4f91b60cb83f3401b76671d Author: Dan Smith Date: Thu Dec 9 16:57:55 2021 -0500 option to disable XML validation for SICD too commit bc2c97e9f79ce91f2dc0ce9b3d5e45a7e60a852b Author: Dan Smith Date: Thu Dec 9 16:09:44 2021 -0500 Squashed commit of the following: commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1 Author: Dan Smith Date: Thu Dec 9 16:09:17 2021 -0500 "private" is part of name mangling commit 351a45f61d63e26fbd379516f073876bf5558050 Author: Dan Smith Date: Thu Dec 9 15:54:13 2021 -0500 more xml.lite updates from coda-oss commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983 Author: Dan Smith Date: Thu Dec 9 15:15:34 2021 -0500 trying to fine the right macro for SWIG commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41 Author: Dan Smith Date: Thu Dec 9 14:51:34 2021 -0500 need updates to Python bindings too commit e208dd4d072fd9f18860e84f54d68efdebef49a9 Author: Dan Smith Date: Thu Dec 9 14:41:12 2021 -0500 xml.lite changes from coda-oss commit 169df75cb962580fa63f1be3fbf9189c1fd74915 Author: Dan Smith Date: Wed Dec 8 14:32:37 2021 -0500 latest from coda-oss commit 4cd813b2f115cd2446821bf01dcf7d8c27781322 Author: Dan Smith Date: Thu Dec 9 15:16:01 2021 -0500 Squashed commit of the following: commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983 Author: Dan Smith Date: Thu Dec 9 15:15:34 2021 -0500 trying to fine the right macro for SWIG commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41 Author: Dan Smith Date: Thu Dec 9 14:51:34 2021 -0500 need updates to Python bindings too commit e208dd4d072fd9f18860e84f54d68efdebef49a9 Author: Dan Smith Date: Thu Dec 9 14:41:12 2021 -0500 xml.lite changes from coda-oss commit 169df75cb962580fa63f1be3fbf9189c1fd74915 Author: Dan Smith Date: Wed Dec 8 14:32:37 2021 -0500 latest from coda-oss commit 7b210f96d175c35dd4d93a8ede3b1127b6fe442c Author: Dan Smith Date: Thu Dec 9 14:51:53 2021 -0500 Squashed commit of the following: commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41 Author: Dan Smith Date: Thu Dec 9 14:51:34 2021 -0500 need updates to Python bindings too commit e208dd4d072fd9f18860e84f54d68efdebef49a9 Author: Dan Smith Date: Thu Dec 9 14:41:12 2021 -0500 xml.lite changes from coda-oss commit 169df75cb962580fa63f1be3fbf9189c1fd74915 Author: Dan Smith Date: Wed Dec 8 14:32:37 2021 -0500 latest from coda-oss commit 4a4d621a17bb568fa07453a6a06f08f34efb7b73 Author: Dan Smith Date: Thu Dec 9 14:47:21 2021 -0500 trying to get the "french" SICD unit-test working commit d63e6eace772c8d02616f467d698da48a14568dd Author: Dan Smith Date: Thu Dec 9 14:42:55 2021 -0500 Squashed commit of the following: commit e208dd4d072fd9f18860e84f54d68efdebef49a9 Author: Dan Smith Date: Thu Dec 9 14:41:12 2021 -0500 xml.lite changes from coda-oss commit 169df75cb962580fa63f1be3fbf9189c1fd74915 Author: Dan Smith Date: Wed Dec 8 14:32:37 2021 -0500 latest from coda-oss commit d1a7e6f442aff2530a7fd8078b88a56ce050238f Author: Dan Smith Date: Thu Dec 9 09:29:07 2021 -0500 test_valid_six unittests now working commit d6fb257c92ab8e97e2d2a2164484011c60d2c95d Author: Dan Smith Date: Wed Dec 8 17:45:26 2021 -0500 trying to re-enable more unittests commit c787e98a7f339740389e10f5c5cb3760617f3ed1 Author: Dan Smith Date: Wed Dec 8 16:54:28 2021 -0500 unit-test breaks on Linux commit bd82787be8ae4f4cd463faa2bb6d2cb5c6d7dba6 Author: Dan Smith Date: Wed Dec 8 15:25:31 2021 -0500 Squashed commit of the following: commit c56ac71fcb152d3a802a548b59d90ccc09dfaf83 Author: Dan Smith Date: Wed Dec 8 15:23:00 2021 -0500 merge in develop/SIDD-3.0 commit e621466a38f21d5b66847f5358b4def1fd4ea4ce Author: Dan Smith Date: Wed Dec 8 15:08:04 2021 -0500 merge in develop/8AMPI_PHSI commit 67768ea901bbd983becc4790b478afe0f17828d5 Author: Dan Smith Date: Thu Dec 9 10:02:19 2021 -0500 Squashed commit of the following: commit d1a7e6f442aff2530a7fd8078b88a56ce050238f Author: Dan Smith Date: Thu Dec 9 09:29:07 2021 -0500 test_valid_six unittests now working commit d6fb257c92ab8e97e2d2a2164484011c60d2c95d Author: Dan Smith Date: Wed Dec 8 17:45:26 2021 -0500 trying to re-enable more unittests commit c787e98a7f339740389e10f5c5cb3760617f3ed1 Author: Dan Smith Date: Wed Dec 8 16:54:28 2021 -0500 unit-test breaks on Linux commit bd82787be8ae4f4cd463faa2bb6d2cb5c6d7dba6 Author: Dan Smith Date: Wed Dec 8 15:25:31 2021 -0500 Squashed commit of the following: commit c56ac71fcb152d3a802a548b59d90ccc09dfaf83 Author: Dan Smith Date: Wed Dec 8 15:23:00 2021 -0500 merge in develop/SIDD-3.0 commit e621466a38f21d5b66847f5358b4def1fd4ea4ce Author: Dan Smith Date: Wed Dec 8 15:08:04 2021 -0500 merge in develop/8AMPI_PHSI commit b582c055ba1f0f2532d2f5ad4c97b3cd649e69bd Author: Dan Smith Date: Wed Dec 8 15:26:24 2021 -0500 Squashed commit of the following: commit bd82787be8ae4f4cd463faa2bb6d2cb5c6d7dba6 Author: Dan Smith Date: Wed Dec 8 15:25:31 2021 -0500 Squashed commit of the following: commit c56ac71fcb152d3a802a548b59d90ccc09dfaf83 Author: Dan Smith Date: Wed Dec 8 15:23:00 2021 -0500 merge in develop/SIDD-3.0 commit e621466a38f21d5b66847f5358b4def1fd4ea4ce Author: Dan Smith Date: Wed Dec 8 15:08:04 2021 -0500 merge in develop/8AMPI_PHSI commit c56ac71fcb152d3a802a548b59d90ccc09dfaf83 Author: Dan Smith Date: Wed Dec 8 15:23:00 2021 -0500 merge in develop/SIDD-3.0 commit 33bd17059640d2a02f9766285f05dcdff5de50a8 Author: Dan Smith Date: Mon Dec 13 11:44:54 2021 -0500 nitro release 2.10.7 commit ef19ad2033851682eb3a37bada3a57fcb2b93ef8 Author: Dan Smith Date: Mon Dec 13 11:42:09 2021 -0500 coda-oss release 2021-12-13 commit 86c1856021a5a944c464f9d3cba397a918f68a81 Author: Dan Smith Date: Fri Dec 10 11:57:26 2021 -0500 xml.lite tweaks from coda-oss commit f21f79d3f494e1ca8a5236e95ff5503fdb04e43b Author: Dan Smith Date: Thu Dec 9 17:36:09 2021 -0500 test_xmlParser might be be running in coda-oss commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1 Author: Dan Smith Date: Thu Dec 9 16:09:17 2021 -0500 "private" is part of name mangling commit 351a45f61d63e26fbd379516f073876bf5558050 Author: Dan Smith Date: Thu Dec 9 15:54:13 2021 -0500 more xml.lite updates from coda-oss commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983 Author: Dan Smith Date: Thu Dec 9 15:15:34 2021 -0500 trying to fine the right macro for SWIG commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41 Author: Dan Smith Date: Thu Dec 9 14:51:34 2021 -0500 need updates to Python bindings too commit e208dd4d072fd9f18860e84f54d68efdebef49a9 Author: Dan Smith Date: Thu Dec 9 14:41:12 2021 -0500 xml.lite changes from coda-oss commit 169df75cb962580fa63f1be3fbf9189c1fd74915 Author: Dan Smith Date: Wed Dec 8 14:32:37 2021 -0500 latest from coda-oss * we know the angle is in radians * explicitly dependency on 'units' * trying to fix broken build * "C++" -> "c++" * Squashed commit of the following: commit 0b4deaa12fade653e20ccb4460fc424bef89d4c6 Author: Dan Smith Date: Tue Jan 18 10:23:38 2022 -0500 turn off some code-analysis diagnostics commit 8797cd0b51617057496d9f89ea2a7602cabb13be Author: Dan Smith Date: Tue Jan 18 10:23:22 2022 -0500 account for str:: changes in coda-oss commit 920d0b79f1b91a1196171deaa61a91626ad7c44d Author: Dan Smith Date: Tue Jan 18 09:54:08 2022 -0500 latest from coda-oss commit 8e308afcf7b35945bdb3cb6c27cc94e63aa18b3b Author: Dan Smith Date: Mon Jan 17 15:26:32 2022 -0500 construct a std::span directly, no make_span() utility (generates CA diagnostic) commit d81a4d1aaac1cdaec1d9dc6a3838343e201d2b81 Author: Dan Smith Date: Mon Jan 17 14:06:58 2022 -0500 latest from coda-oss commit 06716b781a3e6f0cf440b0f1bc5251bec415287e Author: Dan Smith Date: Mon Jan 17 13:24:46 2022 -0500 finish renaming of sys/Filesystem.* to sys/filesystem.* commit b3d0b4b8f4ad15c64e9f000143e64da3df1b241e Author: Dan Smith Date: Mon Jan 17 13:24:07 2022 -0500 rename sys/Filesystem commit c30ae278f01cc681c83a3a32afa3f3db174cfa06 Author: Dan Smith Date: Mon Jan 17 12:30:21 2022 -0500 no more gsl::make_span commit e61dca0022fc39fdb9f4b63353dc93476fdd98bb Author: Dan Smith Date: Mon Jan 17 11:19:07 2022 -0500 sys/Bit.h -> std/bit commit bb67d052044cd1274d21b9b870f85da4b2040cf1 Author: Dan Smith Date: Mon Jan 17 10:49:02 2022 -0500 sys::Filesystem -> coda_oss::filesystem commit ef212eaf09f87ffec27e8c043217ffbd33b29d1f Author: Dan Smith Date: Mon Jan 17 10:02:46 2022 -0500 tweaks to get coda-oss building w/o warnings commit 6f6bfaacc537067b7d36a363297e716e14e2e075 Author: Dan Smith Date: Mon Jan 17 09:57:35 2022 -0500 latest from "nitro" commit 90be0243a2d384bc6ee0d81967240ee1d802bdb4 Author: Dan Smith Date: Mon Jan 17 09:54:33 2022 -0500 update to account for coda-oss changes commit 28632726cc356524c5a3db5117ead37731342824 Author: Dan Smith Date: Mon Jan 17 09:40:48 2022 -0500 latest drop from coda-oss commit 92632ef45f7369c3b0ebfdab65f4cdfa3f79f9d1 Author: Dan Smith Date: Tue Jan 11 09:59:47 2022 -0500 Utf-8 -> Windows-1252 commit 9b719935e8189bc3fbe57e4af4d221c3c49548c5 Author: Dan Smith Date: Mon Jan 10 17:20:25 2022 -0500 UTF-8 to native string conversion commit 38dbe6d88e800f360cc9ae388558b09e5b65d95a Merge: 74df9ee57 a11980f60 Author: Dan Smith Date: Mon Jan 10 17:19:11 2022 -0500 Merge branch 'master' into develop/update-externals commit 74df9ee570e4d62fb6c435b4b5e0cef84b57b9d9 Author: Dan Smith Date: Mon Jan 10 13:48:13 2022 -0500 noexcept(false) commit b5181bc210c3c2b0abc918842f6bd83b2a2d3907 Author: Dan Smith Date: Mon Jan 10 12:01:40 2022 -0500 remove comments with a backslash at the end commit 08f8f9c27f46e793d3bc3d9e65b38facc8293521 Author: Dan Smith Date: Mon Jan 10 11:36:15 2022 -0500 certain NITRO unittests don't work in externals/nitro commit dfc3ded9d3c52df1d038833afbdda94cf93e44ee Author: Dan Smith Date: Mon Jan 10 10:55:01 2022 -0500 descriptor updates from "nitro" commit c989c7ec700533a7ce0c294c09a80d68ed0ad6a4 Author: Dan Smith Date: Mon Jan 10 10:41:48 2022 -0500 fix #ifdef commit 571ab4869aeb70f35dcfa046a36aed875c822739 Author: Dan Smith Date: Mon Jan 10 10:27:53 2022 -0500 latest from "nitro" commit 26ba1a99646ac6db8b38d09e183be4318597efdd Author: Dan Smith Date: Mon Jan 10 10:26:37 2022 -0500 latest from coda-oss commit 28ab3500dc4c0f46ad61fd6356fdc76db8b4380e Merge: 2cd678b7e 28afa6552 Author: Dan Smith Date: Mon Jan 10 10:25:33 2022 -0500 Merge branch 'master' into develop/update-externals commit 2cd678b7e2d9fdd46906a6637903fd1325481ffc Author: Dan Smith Date: Thu Jan 6 15:39:49 2022 -0500 more tweaks to remove compiler warnings commit 5d8907616e5bdbf011a9ded45a7cf20e525789d8 Author: Dan Smith Date: Thu Jan 6 15:19:57 2022 -0500 remove errors/warnings from coda-oss commit a535245afdd72ba24ad89f270d3012e12fd30c14 Author: Dan Smith Date: Wed Jan 5 14:07:27 2022 -0500 latest from nitro commit aff92f496d1f402929707a3cb949c5fb7f4e14ba Author: Dan Smith Date: Wed Jan 5 14:04:39 2022 -0500 latest from coda-oss commit 41ba677e3418cb35ec636745ecb2a78fb7e1ac4e Merge: 21cc8ed1f e2e3defbb Author: Dan Smith Date: Wed Jan 5 14:03:26 2022 -0500 Merge branch 'master' into develop/update-externals commit 21cc8ed1f01d74ab9d814fae97aa4f70c1e9ce34 Author: Dan Smith Date: Mon Jan 3 16:43:08 2022 -0500 use strongly-type TRE fields commit 79eb6c8df45ee9f9d296c3d2152971458b6d8def Author: Dan Smith Date: Mon Jan 3 16:41:54 2022 -0500 str::strip from coda-oss commit faf20c7fbb3e3c1888215014b29a08c0b57f1caf Author: Dan Smith Date: Mon Jan 3 12:15:31 2022 -0500 explicitly =delete move commit ec79f1c0aac15ee0b36ed865b341f5d65e8ae0dd Author: Dan Smith Date: Mon Jan 3 11:12:43 2022 -0500 latest from coda-oss commit 22df5a95a3cbc3128780c63114a90181b4af33f8 Merge: db052a2d7 f1f19bdb6 Author: Dan Smith Date: Wed Dec 29 12:25:28 2021 -0500 Merge branch 'master' into develop/update-externals commit db052a2d7bc7db05a9ccadcc5e1554275334bd9c Author: Dan Smith Date: Wed Dec 29 09:17:08 2021 -0500 adjust for coda-oss changes commit 74ce242cf352a333684379cc9bd0278c0cf57571 Author: Dan Smith Date: Wed Dec 29 09:01:34 2021 -0500 latest from coda-oss commit dc960f74d430442cd3359b8218ad9d9a144bd070 Author: Dan Smith Date: Tue Dec 28 10:37:48 2021 -0500 latest from coda-oss commit c6a4bd5b900d83b3407f8793cc756f46965700f4 Author: Dan Smith Date: Fri Dec 17 09:14:23 2021 -0500 sanity-check a URI commit 82b1f21388dbf0f1b3e402ffaf151421d11149b8 Author: Dan Smith Date: Wed Dec 15 09:38:14 2021 -0500 create a "path" after splitting on ":" commit 01cf2b5cadc18b97ac3a51bde9786b519755b1b1 Author: Dan Smith Date: Wed Dec 15 08:50:17 2021 -0500 simple URI validation commit 3610f8e6e0f11a643831280819efb0aff3bb373d Author: Dan Smith Date: Tue Dec 14 09:46:21 2021 -0500 xml.lite tweaks from coda-oss commit 813be14c563d9f4829d342ec008b86da5ef77b27 Merge: 873d4b9d6 9ed21bed3 Author: Dan Smith Date: Mon Dec 13 17:25:22 2021 -0500 Merge branch 'master' into develop/update-externals commit 873d4b9d6c55ae2736fc6208ece14aecf67adf10 Merge: 1c1a7222c ef191da2f Author: Dan Smith Date: Mon Dec 13 13:59:08 2021 -0500 Merge branch 'master' into develop/update-externals commit 1c1a7222c527f5ae89b9c960eb9c3fa9f2ccefa4 Author: Dan Smith Date: Mon Dec 13 13:01:14 2021 -0500 Squashed commit of the following: commit 474b7f2dc37eaa3144b97be8f785911ace32eb4d Author: Dan Smith Date: Mon Dec 13 13:00:02 2021 -0500 xml.lite changes that need to get back to coda-oss commit c9c0ec36cff6ab97ca5c03c3db712794fb511e6e Author: Dan Smith Date: Mon Dec 13 11:45:39 2021 -0500 Squashed commit of the following: commit 33bd17059640d2a02f9766285f05dcdff5de50a8 Author: Dan Smith Date: Mon Dec 13 11:44:54 2021 -0500 nitro release 2.10.7 commit ef19ad2033851682eb3a37bada3a57fcb2b93ef8 Author: Dan Smith Date: Mon Dec 13 11:42:09 2021 -0500 coda-oss release 2021-12-13 commit 86c1856021a5a944c464f9d3cba397a918f68a81 Author: Dan Smith Date: Fri Dec 10 11:57:26 2021 -0500 xml.lite tweaks from coda-oss commit f21f79d3f494e1ca8a5236e95ff5503fdb04e43b Author: Dan Smith Date: Thu Dec 9 17:36:09 2021 -0500 test_xmlParser might be be running in coda-oss commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1 Author: Dan Smith Date: Thu Dec 9 16:09:17 2021 -0500 "private" is part of name mangling commit 351a45f61d63e26fbd379516f073876bf5558050 Author: Dan Smith Date: Thu Dec 9 15:54:13 2021 -0500 more xml.lite updates from coda-oss commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983 Author: Dan Smith Date: Thu Dec 9 15:15:34 2021 -0500 trying to fine the right macro for SWIG commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41 Author: Dan Smith Date: Thu Dec 9 14:51:34 2021 -0500 need updates to Python bindings too commit e208dd4d072fd9f18860e84f54d68efdebef49a9 Author: Dan Smith Date: Thu Dec 9 14:41:12 2021 -0500 xml.lite changes from coda-oss commit 169df75cb962580fa63f1be3fbf9189c1fd74915 Author: Dan Smith Date: Wed Dec 8 14:32:37 2021 -0500 latest from coda-oss commit 1a74d4046085b286d6b0ae02bc62df608fc70ffa Author: Dan Smith Date: Fri Dec 10 12:26:10 2021 -0500 more use of new xml.lite infrastructure commit 5d641a46f254f78f1e8a03c11f35f2f73c54ed5a Author: Dan Smith Date: Fri Dec 10 11:58:22 2021 -0500 use new xml.lite APIs to simplify code commit 01f811e622eb3b8fcb7f20d8cba8c2d384894b31 Author: Dan Smith Date: Fri Dec 10 11:57:57 2021 -0500 Squashed commit of the following: commit 86c1856021a5a944c464f9d3cba397a918f68a81 Author: Dan Smith Date: Fri Dec 10 11:57:26 2021 -0500 xml.lite tweaks from coda-oss commit f21f79d3f494e1ca8a5236e95ff5503fdb04e43b Author: Dan Smith Date: Thu Dec 9 17:36:09 2021 -0500 test_xmlParser might be be running in coda-oss commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1 Author: Dan Smith Date: Thu Dec 9 16:09:17 2021 -0500 "private" is part of name mangling commit 351a45f61d63e26fbd379516f073876bf5558050 Author: Dan Smith Date: Thu Dec 9 15:54:13 2021 -0500 more xml.lite updates from coda-oss commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983 Author: Dan Smith Date: Thu Dec 9 15:15:34 2021 -0500 trying to fine the right macro for SWIG commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41 Author: Dan Smith Date: Thu Dec 9 14:51:34 2021 -0500 need updates to Python bindings too commit e208dd4d072fd9f18860e84f54d68efdebef49a9 Author: Dan Smith Date: Thu Dec 9 14:41:12 2021 -0500 xml.lite changes from coda-oss commit 169df75cb962580fa63f1be3fbf9189c1fd74915 Author: Dan Smith Date: Wed Dec 8 14:32:37 2021 -0500 latest from coda-oss commit 25b83eb24e0ebf095522df47349e7c5fbf1df8e3 Author: Dan Smith Date: Fri Dec 10 09:06:38 2021 -0500 Squashed commit of the following: commit 3f59a6260e33423c21326dde8e5bed7dc93cd9f0 Author: Dan Smith Date: Fri Dec 10 08:44:54 2021 -0500 still can't get French XML working commit 1a826e5c300d0e2781a015d1916eba8556a36c2d Author: Dan Smith Date: Thu Dec 9 17:37:11 2021 -0500 Squashed commit of the following: commit f21f79d3f494e1ca8a5236e95ff5503fdb04e43b Author: Dan Smith Date: Thu Dec 9 17:36:09 2021 -0500 test_xmlParser might be be running in coda-oss commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1 Author: Dan Smith Date: Thu Dec 9 16:09:17 2021 -0500 "private" is part of name mangling commit 351a45f61d63e26fbd379516f073876bf5558050 Author: Dan Smith Date: Thu Dec 9 15:54:13 2021 -0500 more xml.lite updates from coda-oss commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983 Author: Dan Smith Date: Thu Dec 9 15:15:34 2021 -0500 trying to fine the right macro for SWIG commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41 Author: Dan Smith Date: Thu Dec 9 14:51:34 2021 -0500 need updates to Python bindings too commit e208dd4d072fd9f18860e84f54d68efdebef49a9 Author: Dan Smith Date: Thu Dec 9 14:41:12 2021 -0500 xml.lite changes from coda-oss commit 169df75cb962580fa63f1be3fbf9189c1fd74915 Author: Dan Smith Date: Wed Dec 8 14:32:37 2021 -0500 latest from coda-oss commit f705be9129ea7c71d6bdc25899b53fd3f655b974 Author: Dan Smith Date: Thu Dec 9 17:35:35 2021 -0500 add overloads for other code commit d61323431bea6e33c4f91b60cb83f3401b76671d Author: Dan Smith Date: Thu Dec 9 16:57:55 2021 -0500 option to disable XML validation for SICD too commit bc2c97e9f79ce91f2dc0ce9b3d5e45a7e60a852b Author: Dan Smith Date: Thu Dec 9 16:09:44 2021 -0500 Squashed commit of the following: commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1 Author: Dan Smith Date: Thu Dec 9 16:09:17 2021 -0500 "private" is part of name mangling commit 351a45f61d63e26fbd379516f073876bf5558050 Author: Dan Smith Date: Thu Dec 9 15:54:13 2021 -0500 more xml.lite updates from coda-oss commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983 Author: Dan Smith Date: Thu Dec 9 15:15:34 2021 -0500 trying to fine the right macro for SWIG commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41 Author: Dan Smith Date: Thu Dec 9 14:51:34 2021 -0500 need updates to Python bindings too commit e208dd4d072fd9f18860e84f54d68efdebef49a9 Author: Dan Smith Date: Thu Dec 9 14:41:12 2021 -0500 xml.lite changes from coda-oss commit 169df75cb962580fa63f1be3fbf9189c1fd74915 Author: Dan Smith Date: Wed Dec 8 14:32:37 2021 -0500 latest from coda-oss commit 4cd813b2f115cd2446821bf01dcf7d8c27781322 Author: Dan Smith Date: Thu Dec 9 15:16:01 2021 -0500 Squashed commit of the following: commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983 Author: Dan Smith Date: Thu Dec 9 15:15:34 2021 -0500 trying to fine the right macro for SWIG commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41 Author: Dan Smith Date: Thu Dec 9 14:51:34 2021 -0500 need updates to Python bindings too commit e208dd4d072fd9f18860e84f54d68efdebef49a9 Author: Dan Smith Date: Thu Dec 9 14:41:12 2021 -0500 xml.lite changes from coda-oss commit 169df75cb962580fa63f1be3fbf9189c1fd74915 Author: Dan Smith Date: Wed Dec 8 14:32:37 2021 -0500 latest from coda-oss commit 7b210f96d175c35dd4d93a8ede3b1127b6fe442c Author: Dan Smith Date: Thu Dec 9 14:51:53 2021 -0500 Squashed commit of the following: commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41 Author: Dan Smith Date: Thu Dec 9 14:51:34 2021 -0500 need updates to Python bindings too commit e208dd4d072fd9f18860e84f54d68efdebef49a9 Author: Dan Smith Date: Thu Dec 9 14:41:12 2021 -0500 xml.lite changes from coda-oss commit 169df75cb962580fa63f1be3fbf9189c1fd74915 Author: Dan Smith Date: Wed Dec 8 14:32:37 2021 -0500 latest from coda-oss commit 4a4d621a17bb568fa07453a6a06f08f34efb7b73 Author: Dan Smith Date: Thu Dec 9 14:47:21 2021 -0500 trying to get the "french" SICD unit-test working commit d63e6eace772c8d02616f467d698da48a14568dd Author: Dan Smith Date: Thu Dec 9 14:42:55 2021 -0500 Squashed commit of the following: commit e208dd4d072fd9f18860e84f54d68efdebef49a9 Author: Dan Smith Date: Thu Dec 9 14:41:12 2021 -0500 xml.lite changes from coda-oss commit 169df75cb962580fa63f1be3fbf9189c1fd74915 Author: Dan Smith Date: Wed Dec 8 14:32:37 2021 -0500 latest from coda-oss commit d1a7e6f442aff2530a7fd8078b88a56ce050238f Author: Dan Smith Date: Thu Dec 9 09:29:07 2021 -0500 test_valid_six unittests now working commit d6fb257c92ab8e97e2d2a2164484011c60d2c95d Author: Dan Smith Date: Wed Dec 8 17:45:26 2021 -0500 trying to re-enable more unittests commit c787e98a7f339740389e10f5c5cb3760617f3ed1 Author: Dan Smith Date: Wed Dec 8 16:54:28 2021 -0500 unit-test breaks on Linux commit bd82787be8ae4f4cd463faa2bb6d2cb5c6d7dba6 Author: Dan Smith Date: Wed Dec 8 15:25:31 2021 -0500 Squashed commit of the following: commit c56ac71fcb152d3a802a548b59d90ccc09dfaf83 Author: Dan Smith Date: Wed Dec 8 15:23:00 2021 -0500 merge in develop/SIDD-3.0 commit e621466a38f21d5b66847f5358b4def1fd4ea4ce Author: Dan Smith Date: Wed Dec 8 15:08:04 2021 -0500 merge in develop/8AMPI_PHSI commit 67768ea901bbd983becc4790b478afe0f17828d5 Author: Dan Smith Date: Thu Dec 9 10:02:19 2021 -0500 Squashed commit of the following: commit d1a7e6f442aff2530a7fd8078b88a56ce050238f Author: Dan Smith Date: Thu Dec 9 09:29:07 2021 -0500 test_valid_six unittests now working commit d6fb257c92ab8e97e2d2a2164484011c60d2c95d Author: Dan Smith Date: Wed Dec 8 17:45:26 2021 -0500 trying to re-enable more unittests commit c787e98a7f339740389e10f5c5cb3760617f3ed1 Author: Dan Smith Date: Wed Dec 8 16:54:28 2021 -0500 unit-test breaks on Linux commit bd82787be8ae4f4cd463faa2bb6d2cb5c6d7dba6 Author: Dan Smith Date: Wed Dec 8 15:25:31 2021 -0500 Squashed commit of the following: commit c56ac71fcb152d3a802a548b59d90ccc09dfaf83 Author: Dan Smith Date: Wed Dec 8 15:23:00 2021 -0500 merge in develop/SIDD-3.0 commit e621466a38f21d5b66847f5358b4def1fd4ea4ce Author: Dan Smith Date: Wed Dec 8 15:08:04 2021 -0500 merge in develop/8AMPI_PHSI commit b582c055ba1f0f2532d2f5ad4c97b3cd649e69bd Author: Dan Smith Date: Wed Dec 8 15:26:24 2021 -0500 Squashed commit of the following: commit bd82787be8ae4f4cd463faa2bb6d2cb5c6d7dba6 Author: Dan Smith Date: Wed Dec 8 15:25:31 2021 -0500 Squashed commit of the following: commit c56ac71fcb152d3a802a548b59d90ccc09dfaf83 Author: Dan Smith Date: Wed Dec 8 15:23:00 2021 -0500 merge in develop/SIDD-3.0 commit e621466a38f21d5b66847f5358b4def1fd4ea4ce Author: Dan Smith Date: Wed Dec 8 15:08:04 2021 -0500 merge in develop/8AMPI_PHSI commit c56ac71fcb152d3a802a548b59d90ccc09dfaf83 Author: Dan Smith Date: Wed Dec 8 15:23:00 2021 -0500 merge in develop/SIDD-3.0 commit 33bd17059640d2a02f9766285f05dcdff5de50a8 Author: Dan Smith Date: Mon Dec 13 11:44:54 2021 -0500 nitro release 2.10.7 commit ef19ad2033851682eb3a37bada3a57fcb2b93ef8 Author: Dan Smith Date: Mon Dec 13 11:42:09 2021 -0500 coda-oss release 2021-12-13 commit 86c1856021a5a944c464f9d3cba397a918f68a81 Author: Dan Smith Date: Fri Dec 10 11:57:26 2021 -0500 xml.lite tweaks from coda-oss commit f21f79d3f494e1ca8a5236e95ff5503fdb04e43b Author: Dan Smith Date: Thu Dec 9 17:36:09 2021 -0500 test_xmlParser might be be running in coda-oss commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1 Author: Dan Smith Date: Thu Dec 9 16:09:17 2021 -0500 "private" is part of name mangling commit 351a45f61d63e26fbd379516f073876bf5558050 Author: Dan Smith Date: Thu Dec 9 15:54:13 2021 -0500 more xml.lite updates from coda-oss commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983 Author: Dan Smith Date: Thu Dec 9 15:15:34 2021 -0500 trying to fine the right macro for SWIG commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41 Author: Dan Smith Date: Thu Dec 9 14:51:34 2021 -0500 need updates to Python bindings too commit e208dd4d072fd9f18860e84f54d68efdebef49a9 Author: Dan Smith Date: Thu Dec 9 14:41:12 2021 -0500 xml.lite changes from coda-oss commit 169df75cb962580fa63f1be3fbf9189c1fd74915 Author: Dan Smith Date: Wed Dec 8 14:32:37 2021 -0500 latest from coda-oss * From M. Stevens: "We found a bug in six that affects 24-bit products." * Squashed commit of the following: commit 25b34ab784e78f98fa6aa4b0e9b04a53caf36779 Author: Dan Smith Date: Tue Jan 18 12:33:44 2022 -0500 minimize changes from "master" commit 0b4deaa12fade653e20ccb4460fc424bef89d4c6 Author: Dan Smith Date: Tue Jan 18 10:23:38 2022 -0500 turn off some code-analysis diagnostics commit 8797cd0b51617057496d9f89ea2a7602cabb13be Author: Dan Smith Date: Tue Jan 18 10:23:22 2022 -0500 account for str:: changes in coda-oss commit 920d0b79f1b91a1196171deaa61a91626ad7c44d Author: Dan Smith Date: Tue Jan 18 09:54:08 2022 -0500 latest from coda-oss commit 8e308afcf7b35945bdb3cb6c27cc94e63aa18b3b Author: Dan Smith Date: Mon Jan 17 15:26:32 2022 -0500 construct a std::span directly, no make_span() utility (generates CA diagnostic) commit d81a4d1aaac1cdaec1d9dc6a3838343e201d2b81 Author: Dan Smith Date: Mon Jan 17 14:06:58 2022 -0500 latest from coda-oss commit 06716b781a3e6f0cf440b0f1bc5251bec415287e Author: Dan Smith Date: Mon Jan 17 13:24:46 2022 -0500 finish renaming of sys/Filesystem.* to sys/filesystem.* commit b3d0b4b8f4ad15c64e9f000143e64da3df1b241e Author: Dan Smith Date: Mon Jan 17 13:24:07 2022 -0500 rename sys/Filesystem commit c30ae278f01cc681c83a3a32afa3f3db174cfa06 Author: Dan Smith Date: Mon Jan 17 12:30:21 2022 -0500 no more gsl::make_span commit e61dca0022fc39fdb9f4b63353dc93476fdd98bb Author: Dan Smith Date: Mon Jan 17 11:19:07 2022 -0500 sys/Bit.h -> std/bit commit bb67d052044cd1274d21b9b870f85da4b2040cf1 Author: Dan Smith Date: Mon Jan 17 10:49:02 2022 -0500 sys::Filesystem -> coda_oss::filesystem commit ef212eaf09f87ffec27e8c043217ffbd33b29d1f Author: Dan Smith Date: Mon Jan 17 10:02:46 2022 -0500 tweaks to get coda-oss building w/o warnings commit 6f6bfaacc537067b7d36a363297e716e14e2e075 Author: Dan Smith Date: Mon Jan 17 09:57:35 2022 -0500 latest from "nitro" commit 90be0243a2d384bc6ee0d81967240ee1d802bdb4 Author: Dan Smith Date: Mon Jan 17 09:54:33 2022 -0500 update to account for coda-oss changes commit 28632726cc356524c5a3db5117ead37731342824 Author: Dan Smith Date: Mon Jan 17 09:40:48 2022 -0500 latest drop from coda-oss commit 92632ef45f7369c3b0ebfdab65f4cdfa3f79f9d1 Author: Dan Smith Date: Tue Jan 11 09:59:47 2022 -0500 Utf-8 -> Windows-1252 commit 9b719935e8189bc3fbe57e4af4d221c3c49548c5 Author: Dan Smith Date: Mon Jan 10 17:20:25 2022 -0500 UTF-8 to native string conversion commit 38dbe6d88e800f360cc9ae388558b09e5b65d95a Merge: 74df9ee57 a11980f60 Author: Dan Smith Date: Mon Jan 10 17:19:11 2022 -0500 Merge branch 'master' into develop/update-externals commit 74df9ee570e4d62fb6c435b4b5e0cef84b57b9d9 Author: Dan Smith Date: Mon Jan 10 13:48:13 2022 -0500 noexcept(false) commit b5181bc210c3c2b0abc918842f6bd83b2a2d3907 Author: Dan Smith Date: Mon Jan 10 12:01:40 2022 -0500 remove comments with a backslash at the end commit 08f8f9c27f46e793d3bc3d9e65b38facc8293521 Author: Dan Smith Date: Mon Jan 10 11:36:15 2022 -0500 certain NITRO unittests don't work in externals/nitro commit dfc3ded9d3c52df1d038833afbdda94cf93e44ee Author: Dan Smith Date: Mon Jan 10 10:55:01 2022 -0500 descriptor updates from "nitro" commit c989c7ec700533a7ce0c294c09a80d68ed0ad6a4 Author: Dan Smith Date: Mon Jan 10 10:41:48 2022 -0500 fix #ifdef commit 571ab4869aeb70f35dcfa046a36aed875c822739 Author: Dan Smith Date: Mon Jan 10 10:27:53 2022 -0500 latest from "nitro" commit 26ba1a99646ac6db8b38d09e183be4318597efdd Author: Dan Smith Date: Mon Jan 10 10:26:37 2022 -0500 latest from coda-oss commit 28ab3500dc4c0f46ad61fd6356fdc76db8b4380e Merge: 2cd678b7e 28afa6552 Author: Dan Smith Date: Mon Jan 10 10:25:33 2022 -0500 Merge branch 'master' into develop/update-externals commit 2cd678b7e2d9fdd46906a6637903fd1325481ffc Author: Dan Smith Date: Thu Jan 6 15:39:49 2022 -0500 more tweaks to remove compiler warnings commit 5d8907616e5bdbf011a9ded45a7cf20e525789d8 Author: Dan Smith Date: Thu Jan 6 15:19:57 2022 -0500 remove errors/warnings from coda-oss commit a535245afdd72ba24ad89f270d3012e12fd30c14 Author: Dan Smith Date: Wed Jan 5 14:07:27 2022 -0500 latest from nitro commit aff92f496d1f402929707a3cb949c5fb7f4e14ba Author: Dan Smith Date: Wed Jan 5 14:04:39 2022 -0500 latest from coda-oss commit 41ba677e3418cb35ec636745ecb2a78fb7e1ac4e Merge: 21cc8ed1f e2e3defbb Author: Dan Smith Date: Wed Jan 5 14:03:26 2022 -0500 Merge branch 'master' into develop/update-externals commit 21cc8ed1f01d74ab9d814fae97aa4f70c1e9ce34 Author: Dan Smith Date: Mon Jan 3 16:43:08 2022 -0500 use strongly-type TRE fields commit 79eb6c8df45ee9f9d296c3d2152971458b6d8def Author: Dan Smith Date: Mon Jan 3 16:41:54 2022 -0500 str::strip from coda-oss commit faf20c7fbb3e3c1888215014b29a08c0b57f1caf Author: Dan Smith Date: Mon Jan 3 12:15:31 2022 -0500 explicitly =delete move commit ec79f1c0aac15ee0b36ed865b341f5d65e8ae0dd Author: Dan Smith Date: Mon Jan 3 11:12:43 2022 -0500 latest from coda-oss commit 22df5a95a3cbc3128780c63114a90181b4af33f8 Merge: db052a2d7 f1f19bdb6 Author: Dan Smith Date: Wed Dec 29 12:25:28 2021 -0500 Merge branch 'master' into develop/update-externals commit db052a2d7bc7db05a9ccadcc5e1554275334bd9c Author: Dan Smith Date: Wed Dec 29 09:17:08 2021 -0500 adjust for coda-oss changes commit 74ce242cf352a333684379cc9bd0278c0cf57571 Author: Dan Smith Date: Wed Dec 29 09:01:34 2021 -0500 latest from coda-oss commit dc960f74d430442cd3359b8218ad9d9a144bd070 Author: Dan Smith Date: Tue Dec 28 10:37:48 2021 -0500 latest from coda-oss commit c6a4bd5b900d83b3407f8793cc756f46965700f4 Author: Dan Smith Date: Fri Dec 17 09:14:23 2021 -0500 sanity-check a URI commit 82b1f21388dbf0f1b3e402ffaf151421d11149b8 Author: Dan Smith Date: Wed Dec 15 09:38:14 2021 -0500 create a "path" after splitting on ":" commit 01cf2b5cadc18b97ac3a51bde9786b519755b1b1 Author: Dan Smith Date: Wed Dec 15 08:50:17 2021 -0500 simple URI validation commit 3610f8e6e0f11a643831280819efb0aff3bb373d Author: Dan Smith Date: Tue Dec 14 09:46:21 2021 -0500 xml.lite tweaks from coda-oss commit 813be14c563d9f4829d342ec008b86da5ef77b27 Merge: 873d4b9d6 9ed21bed3 Author: Dan Smith Date: Mon Dec 13 17:25:22 2021 -0500 Merge branch 'master' into develop/update-externals commit 873d4b9d6c55ae2736fc6208ece14aecf67adf10 Merge: 1c1a7222c ef191da2f Author: Dan Smith Date: Mon Dec 13 13:59:08 2021 -0500 Merge branch 'master' into develop/update-externals commit 1c1a7222c527f5ae89b9c960eb9c3fa9f2ccefa4 Author: Dan Smith Date: Mon Dec 13 13:01:14 2021 -0500 Squashed commit of the following: commit 474b7f2dc37eaa3144b97be8f785911ace32eb4d Author: Dan Smith Date: Mon Dec 13 13:00:02 2021 -0500 xml.lite changes that need to get back to coda-oss commit c9c0ec36cff6ab97ca5c03c3db712794fb511e6e Author: Dan Smith Date: Mon Dec 13 11:45:39 2021 -0500 Squashed commit of the following: commit 33bd17059640d2a02f9766285f05dcdff5de50a8 Author: Dan Smith Date: Mon Dec 13 11:44:54 2021 -0500 nitro release 2.10.7 commit ef19ad2033851682eb3a37bada3a57fcb2b93ef8 Author: Dan Smith Date: Mon Dec 13 11:42:09 2021 -0500 coda-oss release 2021-12-13 commit 86c1856021a5a944c464f9d3cba397a918f68a81 Author: Dan Smith Date: Fri Dec 10 11:57:26 2021 -0500 xml.lite tweaks from coda-oss commit f21f79d3f494e1ca8a5236e95ff5503fdb04e43b Author: Dan Smith Date: Thu Dec 9 17:36:09 2021 -0500 test_xmlParser might be be running in coda-oss commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1 Author: Dan Smith Date: Thu Dec 9 16:09:17 2021 -0500 "private" is part of name mangling commit 351a45f61d63e26fbd379516f073876bf5558050 Author: Dan Smith Date: Thu Dec 9 15:54:13 2021 -0500 more xml.lite updates from coda-oss commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983 Author: Dan Smith Date: Thu Dec 9 15:15:34 2021 -0500 trying to fine the right macro for SWIG commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41 Author: Dan Smith Date: Thu Dec 9 14:51:34 2021 -0500 need updates to Python bindings too commit e208dd4d072fd9f18860e84f54d68efdebef49a9 Author: Dan Smith Date: Thu Dec 9 14:41:12 2021 -0500 xml.lite changes from coda-oss commit 169df75cb962580fa63f1be3fbf9189c1fd74915 Author: Dan Smith Date: Wed Dec 8 14:32:37 2021 -0500 latest from coda-oss commit 1a74d4046085b286d6b0ae02bc62df608fc70ffa Author: Dan Smith Date: Fri Dec 10 12:26:10 2021 -0500 more use of new xml.lite infrastructure commit 5d641a46f254f78f1e8a03c11f35f2f73c54ed5a Author: Dan Smith Date: Fri Dec 10 11:58:22 2021 -0500 use new xml.lite APIs to simplify code commit 01f811e622eb3b8fcb7f20d8cba8c2d384894b31 Author: Dan Smith Date: Fri Dec 10 11:57:57 2021 -0500 Squashed commit of the following: commit 86c1856021a5a944c464f9d3cba397a918f68a81 Author: Dan Smith Date: Fri Dec 10 11:57:26 2021 -0500 xml.lite tweaks from coda-oss commit f21f79d3f494e1ca8a5236e95ff5503fdb04e43b Author: Dan Smith Date: Thu Dec 9 17:36:09 2021 -0500 test_xmlParser might be be running in coda-oss commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1 Author: Dan Smith Date: Thu Dec 9 16:09:17 2021 -0500 "private" is part of name mangling commit 351a45f61d63e26fbd379516f073876bf5558050 Author: Dan Smith Date: Thu Dec 9 15:54:13 2021 -0500 more xml.lite updates from coda-oss commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983 Author: Dan Smith Date: Thu Dec 9 15:15:34 2021 -0500 trying to fine the right macro for SWIG commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41 Author: Dan Smith Date: Thu Dec 9 14:51:34 2021 -0500 need updates to Python bindings too commit e208dd4d072fd9f18860e84f54d68efdebef49a9 Author: Dan Smith Date: Thu Dec 9 14:41:12 2021 -0500 xml.lite changes from coda-oss commit 169df75cb962580fa63f1be3fbf9189c1fd74915 Author: Dan Smith Date: Wed Dec 8 14:32:37 2021 -0500 latest from coda-oss commit 25b83eb24e0ebf095522df47349e7c5fbf1df8e3 Author: Dan Smith Date: Fri Dec 10 09:06:38 2021 -0500 Squashed commit of the following: commit 3f59a6260e33423c21326dde8e5bed7dc93cd9f0 Author: Dan Smith Date: Fri Dec 10 08:44:54 2021 -0500 still can't get French XML working commit 1a826e5c300d0e2781a015d1916eba8556a36c2d Author: Dan Smith Date: Thu Dec 9 17:37:11 2021 -0500 Squashed commit of the following: commit f21f79d3f494e1ca8a5236e95ff5503fdb04e43b Author: Dan Smith Date: Thu Dec 9 17:36:09 2021 -0500 test_xmlParser might be be running in coda-oss commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1 Author: Dan Smith Date: Thu Dec 9 16:09:17 2021 -0500 "private" is part of name mangling commit 351a45f61d63e26fbd379516f073876bf5558050 Author: Dan Smith Date: Thu Dec 9 15:54:13 2021 -0500 more xml.lite updates from coda-oss commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983 Author: Dan Smith Date: Thu Dec 9 15:15:34 2021 -0500 trying to fine the right macro for SWIG commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41 Author: Dan Smith Date: Thu Dec 9 14:51:34 2021 -0500 need updates to Python bindings too commit e208dd4d072fd9f18860e84f54d68efdebef49a9 Author: Dan Smith Date: Thu Dec 9 14:41:12 2021 -0500 xml.lite changes from coda-oss commit 169df75cb962580fa63f1be3fbf9189c1fd74915 Author: Dan Smith Date: Wed Dec 8 14:32:37 2021 -0500 latest from coda-oss commit f705be9129ea7c71d6bdc25899b53fd3f655b974 Author: Dan Smith Date: Thu Dec 9 17:35:35 2021 -0500 add overloads for other code commit d61323431bea6e33c4f91b60cb83f3401b76671d Author: Dan Smith Date: Thu Dec 9 16:57:55 2021 -0500 option to disable XML validation for SICD too commit bc2c97e9f79ce91f2dc0ce9b3d5e45a7e60a852b Author: Dan Smith Date: Thu Dec 9 16:09:44 2021 -0500 Squashed commit of the following: commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1 Author: Dan Smith Date: Thu Dec 9 16:09:17 2021 -0500 "private" is part of name mangling commit 351a45f61d63e26fbd379516f073876bf5558050 Author: Dan Smith Date: Thu Dec 9 15:54:13 2021 -0500 more xml.lite updates from coda-oss commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983 Author: Dan Smith Date: Thu Dec 9 15:15:34 2021 -0500 trying to fine the right macro for SWIG commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41 Author: Dan Smith Date: Thu Dec 9 14:51:34 2021 -0500 need updates to Python bindings too commit e208dd4d072fd9f18860e84f54d68efdebef49a9 Author: Dan Smith Date: Thu Dec 9 14:41:12 2021 -0500 xml.lite changes from coda-oss commit 169df75cb962580fa63f1be3fbf9189c1fd74915 Author: Dan Smith Date: Wed Dec 8 14:32:37 2021 -0500 latest from coda-oss commit 4cd813b2f115cd2446821bf01dcf7d8c27781322 Author: Dan Smith Date: Thu Dec 9 15:16:01 2021 -0500 Squashed commit of the following: commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983 Author: Dan Smith Date: Thu Dec 9 15:15:34 2021 -0500 trying to fine the right macro for SWIG commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41 Author: Dan Smith Date: Thu Dec 9 14:51:34 2021 -0500 need updates to Python bindings too commit e208dd4d072fd9f18860e84f54d68efdebef49a9 Author: Dan Smith Date: Thu Dec 9 14:41:12 2021 -0500 xml.lite changes from coda-oss commit 169df75cb962580fa63f1be3fbf9189c1fd74915 Author: Dan Smith Date: Wed Dec 8 14:32:37 2021 -0500 latest from coda-oss commit 7b210f96d175c35dd4d93a8ede3b1127b6fe442c Author: Dan Smith Date: Thu Dec 9 14:51:53 2021 -0500 Squashed commit of the following: commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41 Author: Dan Smith Date: Thu Dec 9 14:51:34 2021 -0500 need updates to Python bindings too commit e208dd4d072fd9f18860e84f54d68efdebef49a9 Author: Dan Smith Date: Thu Dec 9 14:41:12 2021 -0500 xml.lite changes from coda-oss commit 169df75cb962580fa63f1be3fbf9189c1fd74915 Author: Dan Smith Date: Wed Dec 8 14:32:37 2021 -0500 latest from coda-oss commit 4a4d621a17bb568fa07453a6a06f08f34efb7b73 Author: Dan Smith Date: Thu Dec 9 14:47:21 2021 -0500 trying to get the "french" SICD unit-test working commit d63e6eace772c8d02616f467d698da48a14568dd Author: Dan Smith Date: Thu Dec 9 14:42:55 2021 -0500 Squashed commit of the following: commit e208dd4d072fd9f18860e84f54d68efdebef49a9 Author: Dan Smith Date: Thu Dec 9 14:41:12 2021 -0500 xml.lite changes from coda-oss commit 169df75cb962580fa63f1be3fbf9189c1fd74915 Author: Dan Smith Date: Wed Dec 8 14:32:37 2021 -0500 latest from coda-oss commit d1a7e6f442aff2530a7fd8078b88a56ce050238f Author: Dan Smith Date: Thu Dec 9 09:29:07 2021 -0500 test_valid_six unittests now working commit d6fb257c92ab8e97e2d2a2164484011c60d2c95d Author: Dan Smith Date: Wed Dec 8 17:45:26 2021 -0500 trying to re-enable more unittests commit c787e98a7f339740389e10f5c5cb3760617f3ed1 Author: Dan Smith Date: Wed Dec 8 16:54:28 2021 -0500 unit-test breaks on Linux commit bd82787be8ae4f4cd463faa2bb6d2cb5c6d7dba6 Author: Dan Smith Date: Wed Dec 8 15:25:31 2021 -0500 Squashed commit of the following: commit c56ac71fcb152d3a802a548b59d90ccc09dfaf83 Author: Dan Smith Date: Wed Dec 8 15:23:00 2021 -0500 merge in develop/SIDD-3.0 commit e621466a38f21d5b66847f5358b4def1fd4ea4ce Author: Dan Smith Date: Wed Dec 8 15:08:04 2021 -0500 merge in develop/8AMPI_PHSI commit 67768ea901bbd983becc4790b478afe0f17828d5 Author: Dan Smith Date: Thu Dec 9 10:02:19 2021 -0500 Squashed commit of the following: commit d1a7e6f442aff2530a7fd8078b88a56ce050238f Author: Dan Smith Date: Thu Dec 9 09:29:07 2021 -0500 test_valid_six unittests now working commit d6fb257c92ab8e97e2d2a2164484011c60d2c95d Author: Dan Smith Date: Wed Dec 8 17:45:26 2021 -0500 trying to re-enable more unittests commit c787e98a7f339740389e10f5c5cb3760617f3ed1 Author: Dan Smith Date: Wed Dec 8 16:54:28 2021 -0500 unit-test breaks on Linux commit bd82787be8ae4f4cd463faa2bb6d2cb5c6d7dba6 Author: Dan Smith Date: Wed Dec 8 15:25:31 2021 -0500 Squashed commit of the following: commit c56ac71fcb152d3a802a548b59d90ccc09dfaf83 Author: Dan Smith Date: Wed Dec 8 15:23:00 2021 -0500 merge in develop/SIDD-3.0 commit e621466a38f21d5b66847f5358b4def1fd4ea4ce Author: Dan Smith Date: Wed Dec 8 15:08:04 2021 -0500 merge in develop/8AMPI_PHSI commit b582c055ba1f0f2532d2f5ad4c97b3cd649e69bd Author: Dan Smith Date: Wed Dec 8 15:26:24 2021 -0500 Squashed commit of the following: commit bd82787be8ae4f4cd463faa2bb6d2cb5c6d7dba6 Author: Dan Smith Date: Wed Dec 8 15:25:31 2021 -0500 Squashed commit of the following: commit c56ac71fcb152d3a802a548b59d90ccc09dfaf83 Author: Dan Smith Date: Wed Dec 8 15:23:00 2021 -0500 merge in develop/SIDD-3.0 commit e621466a38f21d5b66847f5358b4def1fd4ea4ce Author: Dan Smith Date: Wed Dec 8 15:08:04 2021 -0500 merge in develop/8AMPI_PHSI commit c56ac71fcb152d3a802a548b59d90ccc09dfaf83 Author: Dan Smith Date: Wed Dec 8 15:23:00 2021 -0500 merge in develop/SIDD-3.0 commit 33bd17059640d2a02f9766285f05dcdff5de50a8 Author: Dan Smith Date: Mon Dec 13 11:44:54 2021 -0500 nitro release 2.10.7 commit ef19ad2033851682eb3a37bada3a57fcb2b93ef8 Author: Dan Smith Date: Mon Dec 13 11:42:09 2021 -0500 coda-oss release 2021-12-13 commit 86c1856021a5a944c464f9d3cba397a918f68a81 Author: Dan Smith Date: Fri Dec 10 11:57:26 2021 -0500 xml.lite tweaks from coda-oss commit f21f79d3f494e1ca8a5236e95ff5503fdb04e43b Author: Dan Smith Date: Thu Dec 9 17:36:09 2021 -0500 test_xmlParser might be be running in coda-oss commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1 Author: Dan Smith Date: Thu Dec 9 16:09:17 2021 -0500 "private" is part of name mangling commit 351a45f61d63e26fbd379516f073876bf5558050 Author: Dan Smith Date: Thu Dec 9 15:54:13 2021 -0500 more xml.lite updates from coda-oss commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983 Author: Dan Smith Date: Thu Dec 9 15:15:34 2021 -0500 trying to fine the right macro for SWIG commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41 Author: Dan Smith Date: Thu Dec 9 14:51:34 2021 -0500 need updates to Python bindings too commit e208dd4d072fd9f18860e84f54d68efdebef49a9 Author: Dan Smith Date: Thu Dec 9 14:41:12 2021 -0500 xml.lite changes from coda-oss commit 169df75cb962580fa63f1be3fbf9189c1fd74915 Author: Dan Smith Date: Wed Dec 8 14:32:37 2021 -0500 latest from coda-oss * Populate the full buffer - not just the first ~32MiB. (#532) I'm merging this into feature/8AMPI_PHSI and from there to master. * expose to_AMP8I_PHS8I() through the bowels of the write infrastructure * control the "cutoff" value passed to to_AMP8I_PHS8I() via a six::Option * old G++ doesn't like a constexpr char[] * Squashed commit of the following: commit 833c031f411d0ae6de11b14c2d9affcc3efad5fb Author: Dan Smith Date: Thu Jan 20 12:58:04 2022 -0500 latest from coda-oss commit 2364ace449ee910356a98dde7f74a15c63aae761 Merge: 25b34ab78 8b6bcf777 Author: Dan Smith Date: Tue Jan 18 13:28:04 2022 -0500 Merge branch 'master' into develop/update-externals commit 25b34ab784e78f98fa6aa4b0e9b04a53caf36779 Author: Dan Smith Date: Tue Jan 18 12:33:44 2022 -0500 minimize changes from "master" commit 0b4deaa12fade653e20ccb4460fc424bef89d4c6 Author: Dan Smith Date: Tue Jan 18 10:23:38 2022 -0500 turn off some code-analysis diagnostics commit 8797cd0b51617057496d9f89ea2a7602cabb13be Author: Dan Smith Date: Tue Jan 18 10:23:22 2022 -0500 account for str:: changes in coda-oss commit 920d0b79f1b91a1196171deaa61a91626ad7c44d Author: Dan Smith Date: Tue Jan 18 09:54:08 2022 -0500 latest from coda-oss commit 8e308afcf7b35945bdb3cb6c27cc94e63aa18b3b Author: Dan Smith Date: Mon Jan 17 15:26:32 2022 -0500 construct a std::span directly, no make_span() utility (generates CA diagnostic) commit d81a4d1aaac1cdaec1d9dc6a3838343e201d2b81 Author: Dan Smith Date: Mon Jan 17 14:06:58 2022 -0500 latest from coda-oss commit 06716b781a3e6f0cf440b0f1bc5251bec415287e Author: Dan Smith Date: Mon Jan 17 13:24:46 2022 -0500 finish renaming of sys/Filesystem.* to sys/filesystem.* commit b3d0b4b8f4ad15c64e9f000143e64da3df1b241e Author: Dan Smith Date: Mon Jan 17 13:24:07 2022 -0500 rename sys/Filesystem commit c30ae278f01cc681c83a3a32afa3f3db174cfa06 Author: Dan Smith Date: Mon Jan 17 12:30:21 2022 -0500 no more gsl::make_span commit e61dca0022fc39fdb9f4b63353dc93476fdd98bb Author: Dan Smith Date: Mon Jan 17 11:19:07 2022 -0500 sys/Bit.h -> std/bit commit bb67d052044cd1274d21b9b870f85da4b2040cf1 Author: Dan Smith Date: Mon Jan 17 10:49:02 2022 -0500 sys::Filesystem -> coda_oss::filesystem commit ef212eaf09f87ffec27e8c043217ffbd33b29d1f Author: Dan Smith Date: Mon Jan 17 10:02:46 2022 -0500 tweaks to get coda-oss building w/o warnings commit 6f6bfaacc537067b7d36a363297e716e14e2e075 Author: Dan Smith Date: Mon Jan 17 09:57:35 2022 -0500 latest from "nitro" commit 90be0243a2d384bc6ee0d81967240ee1d802bdb4 Author: Dan Smith Date: Mon Jan 17 09:54:33 2022 -0500 update to account for coda-oss changes commit 28632726cc356524c5a3db5117ead37731342824 Author: Dan Smith Date: Mon Jan 17 09:40:48 2022 -0500 latest drop from coda-oss commit 92632ef45f7369c3b0ebfdab65f4cdfa3f79f9d1 Author: Dan Smith Date: Tue Jan 11 09:59:47 2022 -0500 Utf-8 -> Windows-1252 commit 9b719935e8189bc3fbe57e4af4d221c3c49548c5 Author: Dan Smith Date: Mon Jan 10 17:20:25 2022 -0500 UTF-8 to native string conversion commit 38dbe6d88e800f360cc9ae388558b09e5b65d95a Merge: 74df9ee57 a11980f60 Author: Dan Smith Date: Mon Jan 10 17:19:11 2022 -0500 Merge branch 'master' into develop/update-externals commit 74df9ee570e4d62fb6c435b4b5e0cef84b57b9d9 Author: Dan Smith Date: Mon Jan 10 13:48:13 2022 -0500 noexcept(false) commit b5181bc210c3c2b0abc918842f6bd83b2a2d3907 Author: Dan Smith Date: Mon Jan 10 12:01:40 2022 -0500 remove comments with a backslash at the end commit 08f8f9c27f46e793d3bc3d9e65b38facc8293521 Author: Dan Smith Date: Mon Jan 10 11:36:15 2022 -0500 certain NITRO unittests don't work in externals/nitro commit dfc3ded9d3c52df1d038833afbdda94cf93e44ee Author: Dan Smith Date: Mon Jan 10 10:55:01 2022 -0500 descriptor updates from "nitro" commit c989c7ec700533a7ce0c294c09a80d68ed0ad6a4 Author: Dan Smith Date: Mon Jan 10 10:41:48 2022 -0500 fix #ifdef commit 571ab4869aeb70f35dcfa046a36aed875c822739 Author: Dan Smith Date: Mon Jan 10 10:27:53 2022 -0500 latest from "nitro" commit 26ba1a99646ac6db8b38d09e183be4318597efdd Author: Dan Smith Date: Mon Jan 10 10:26:37 2022 -0500 latest from coda-oss commit 28ab3500dc4c0f46ad61fd6356fdc76db8b4380e Merge: 2cd678b7e 28afa6552 Author: Dan Smith Date: Mon Jan 10 10:25:33 2022 -0500 Merge branch 'master' into develop/update-externals commit 2cd678b7e2d9fdd46906a6637903fd1325481ffc Author: Dan Smith Date: Thu Jan 6 15:39:49 2022 -0500 more tweaks to remove compiler warnings commit 5d8907616e5bdbf011a9ded45a7cf20e525789d8 Author: Dan Smith Date: Thu Jan 6 15:19:57 2022 -0500 remove errors/warnings from coda-oss commit a535245afdd72ba24ad89f270d3012e12fd30c14 Author: Dan Smith Date: Wed Jan 5 14:07:27 2022 -0500 latest from nitro commit aff92f496d1f402929707a3cb949c5fb7f4e14ba Author: Dan Smith Date: Wed Jan 5 14:04:39 2022 -0500 latest from coda-oss commit 41ba677e3418cb35ec636745ecb2a78fb7e1ac4e Merge: 21cc8ed1f e2e3defbb Author: Dan Smith Date: Wed Jan 5 14:03:26 2022 -0500 Merge branch 'master' into develop/update-externals commit 21cc8ed1f01d74ab9d814fae97aa4f70c1e9ce34 Author: Dan Smith Date: Mon Jan 3 16:43:08 2022 -0500 use strongly-type TRE fields commit 79eb6c8df45ee9f9d296c3d2152971458b6d8def Author: Dan Smith Date: Mon Jan 3 16:41:54 2022 -0500 str::strip from coda-oss commit faf20c7fbb3e3c1888215014b29a08c0b57f1caf Author: Dan Smith Date: Mon Jan 3 12:15:31 2022 -0500 explicitly =delete move commit ec79f1c0aac15ee0b36ed865b341f5d65e8ae0dd Author: Dan Smith Date: Mon Jan 3 11:12:43 2022 -0500 latest from coda-oss commit 22df5a95a3cbc3128780c63114a90181b4af33f8 Merge: db052a2d7 f1f19bdb6 Author: Dan Smith Date: Wed Dec 29 12:25:28 2021 -0500 Merge branch 'master' into develop/update-externals commit db052a2d7bc7db05a9ccadcc5e1554275334bd9c Author: Dan Smith Date: Wed Dec 29 09:17:08 2021 -0500 adjust for coda-oss changes commit 74ce242cf352a333684379cc9bd0278c0cf57571 Author: Dan Smith Date: Wed Dec 29 09:01:34 2021 -0500 latest from coda-oss commit dc960f74d430442cd3359b8218ad9d9a144bd070 Author: Dan Smith Date: Tue Dec 28 10:37:48 2021 -0500 latest from coda-oss commit c6a4bd5b900d83b3407f8793cc756f46965700f4 Author: Dan Smith Date: Fri Dec 17 09:14:23 2021 -0500 sanity-check a URI commit 82b1f21388dbf0f1b3e402ffaf151421d11149b8 Author: Dan Smith Date: Wed Dec 15 09:38:14 2021 -0500 create a "path" after splitting on ":" commit 01cf2b5cadc18b97ac3a51bde9786b519755b1b1 Author: Dan Smith Date: Wed Dec 15 08:50:17 2021 -0500 simple URI validation commit 3610f8e6e0f11a643831280819efb0aff3bb373d Author: Dan Smith Date: Tue Dec 14 09:46:21 2021 -0500 xml.lite tweaks from coda-oss commit 813be14c563d9f4829d342ec008b86da5ef77b27 Merge: 873d4b9d6 9ed21bed3 Author: Dan Smith Date: Mon Dec 13 17:25:22 2021 -0500 Merge branch 'master' into develop/update-externals commit 873d4b9d6c55ae2736fc6208ece14aecf67adf10 Merge: 1c1a7222c ef191da2f Author: Dan Smith Date: Mon Dec 13 13:59:08 2021 -0500 Merge branch 'master' into develop/update-externals commit 1c1a7222c527f5ae89b9c960eb9c3fa9f2ccefa4 Author: Dan Smith Date: Mon Dec 13 13:01:14 2021 -0500 Squashed commit of the following: commit 474b7f2dc37eaa3144b97be8f785911ace32eb4d Author: Dan Smith Date: Mon Dec 13 13:00:02 2021 -0500 xml.lite changes that need to get back to coda-oss commit c9c0ec36cff6ab97ca5c03c3db712794fb511e6e Author: Dan Smith Date: Mon Dec 13 11:45:39 2021 -0500 Squashed commit of the following: commit 33bd17059640d2a02f9766285f05dcdff5de50a8 Author: Dan Smith Date: Mon Dec 13 11:44:54 2021 -0500 nitro release 2.10.7 commit ef19ad2033851682eb3a37bada3a57fcb2b93ef8 Author: Dan Smith Date: Mon Dec 13 11:42:09 2021 -0500 coda-oss release 2021-12-13 commit 86c1856021a5a944c464f9d3cba397a918f68a81 Author: Dan Smith Date: Fri Dec 10 11:57:26 2021 -0500 xml.lite tweaks from coda-oss commit f21f79d3f494e1ca8a5236e95ff5503fdb04e43b Author: Dan Smith Date: Thu Dec 9 17:36:09 2021 -0500 test_xmlParser might be be running in coda-oss commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1 Author: Dan Smith Date: Thu Dec 9 16:09:17 2021 -0500 "private" is part of name mangling commit 351a45f61d63e26fbd379516f073876bf5558050 Author: Dan Smith Date: Thu Dec 9 15:54:13 2021 -0500 more xml.lite updates from coda-oss commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983 Author: Dan Smith Date: Thu Dec 9 15:15:34 2021 -0500 trying to fine the right macro for SWIG commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41 Author: Dan Smith Date: Thu Dec 9 14:51:34 2021 -0500 need updates to Python bindings too commit e208dd4d072fd9f18860e84f54d68efdebef49a9 Author: Dan Smith Date: Thu Dec 9 14:41:12 2021 -0500 xml.lite changes from coda-oss commit 169df75cb962580fa63f1be3fbf9189c1fd74915 Author: Dan Smith Date: Wed Dec 8 14:32:37 2021 -0500 latest from coda-oss commit 1a74d4046085b286d6b0ae02bc62df608fc70ffa Author: Dan Smith Date: Fri Dec 10 12:26:10 2021 -0500 more use of new xml.lite infrastructure commit 5d641a46f254f78f1e8a03c11f35f2f73c54ed5a Author: Dan Smith Date: Fri Dec 10 11:58:22 2021 -0500 use new xml.lite APIs to simplify code commit 01f811e622eb3b8fcb7f20d8cba8c2d384894b31 Author: Dan Smith Date: Fri Dec 10 11:57:57 2021 -0500 Squashed commit of the following: commit 86c1856021a5a944c464f9d3cba397a918f68a81 Author: Dan Smith Date: Fri Dec 10 11:57:26 2021 -0500 xml.lite tweaks from coda-oss commit f21f79d3f494e1ca8a5236e95ff5503fdb04e43b Author: Dan Smith Date: Thu Dec 9 17:36:09 2021 -0500 test_xmlParser might be be running in coda-oss commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1 Author: Dan Smith Date: Thu Dec 9 16:09:17 2021 -0500 "private" is part of name mangling commit 351a45f61d63e26fbd379516f073876bf5558050 Author: Dan Smith Date: Thu Dec 9 15:54:13 2021 -0500 more xml.lite updates from coda-oss commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983 Author: Dan Smith Date: Thu Dec 9 15:15:34 2021 -0500 trying to fine the right macro for SWIG commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41 Author: Dan Smith Date: Thu Dec 9 14:51:34 2021 -0500 need updates to Python bindings too commit e208dd4d072fd9f18860e84f54d68efdebef49a9 Author: Dan Smith Date: Thu Dec 9 14:41:12 2021 -0500 xml.lite changes from coda-oss commit 169df75cb962580fa63f1be3fbf9189c1fd74915 Author: Dan Smith Date: Wed Dec 8 14:32:37 2021 -0500 latest from coda-oss commit 25b83eb24e0ebf095522df47349e7c5fbf1df8e3 Author: Dan Smith Date: Fri Dec 10 09:06:38 2021 -0500 Squashed commit of the following: commit 3f59a6260e33423c21326dde8e5bed7dc93cd9f0 Author: Dan Smith Date: Fri Dec 10 08:44:54 2021 -0500 still can't get French XML working commit 1a826e5c300d0e2781a015d1916eba8556a36c2d Author: Dan Smith Date: Thu Dec 9 17:37:11 2021 -0500 Squashed commit of the following: commit f21f79d3f494e1ca8a5236e95ff5503fdb04e43b Author: Dan Smith Date: Thu Dec 9 17:36:09 2021 -0500 test_xmlParser might be be running in coda-oss commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1 Author: Dan Smith Date: Thu Dec 9 16:09:17 2021 -0500 "private" is part of name mangling commit 351a45f61d63e26fbd379516f073876bf5558050 Author: Dan Smith Date: Thu Dec 9 15:54:13 2021 -0500 more xml.lite updates from coda-oss commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983 Author: Dan Smith Date: Thu Dec 9 15:15:34 2021 -0500 trying to fine the right macro for SWIG commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41 Author: Dan Smith Date: Thu Dec 9 14:51:34 2021 -0500 need updates to Python bindings too commit e208dd4d072fd9f18860e84f54d68efdebef49a9 Author: Dan Smith Date: Thu Dec 9 14:41:12 2021 -0500 xml.lite changes from coda-oss commit 169df75cb962580fa63f1be3fbf9189c1fd74915 Author: Dan Smith Date: Wed Dec 8 14:32:37 2021 -0500 latest from coda-oss commit f705be9129ea7c71d6bdc25899b53fd3f655b974 Author: Dan Smith Date: Thu Dec 9 17:35:35 2021 -0500 add overloads for other code commit d61323431bea6e33c4f91b60cb83f3401b76671d Author: Dan Smith Date: Thu Dec 9 16:57:55 2021 -0500 option to disable XML validation for SICD too commit bc2c97e9f79ce91f2dc0ce9b3d5e45a7e60a852b Author: Dan Smith Date: Thu Dec 9 16:09:44 2021 -0500 Squashed commit of the following: commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1 Author: Dan Smith Date: Thu Dec 9 16:09:17 2021 -0500 "private" is part of name mangling commit 351a45f61d63e26fbd379516f073876bf5558050 Author: Dan Smith Date: Thu Dec 9 15:54:13 2021 -0500 more xml.lite updates from coda-oss commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983 Author: Dan Smith Date: Thu Dec 9 15:15:34 2021 -0500 trying to fine the right macro for SWIG commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41 Author: Dan Smith Date: Thu Dec 9 14:51:34 2021 -0500 need updates to Python bindings too commit e208dd4d072fd9f18860e84f54d68efdebef49a9 Author: Dan Smith Date: Thu Dec 9 14:41:12 2021 -0500 xml.lite changes from coda-oss commit 169df75cb962580fa63f1be3fbf9189c1fd74915 Author: Dan Smith Date: Wed Dec 8 14:32:37 2021 -0500 latest from coda-oss commit 4cd813b2f115cd2446821bf01dcf7d8c27781322 Author: Dan Smith Date: Thu Dec 9 15:16:01 2021 -0500 Squashed commit of the following: commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983 Author: Dan Smith Date: Thu Dec 9 15:15:34 2021 -0500 trying to fine the right macro for SWIG commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41 Author: Dan Smith Date: Thu Dec 9 14:51:34 2021 -0500 need updates to Python bindings too commit e208dd4d072fd9f18860e84f54d68efdebef49a9 Author: Dan Smith Date: Thu Dec 9 14:41:12 2021 -0500 xml.lite changes from coda-oss commit 169df75cb962580fa63f1be3fbf9189c1fd74915 Author: Dan Smith Date: Wed Dec 8 14:32:37 2021 -0500 latest from coda-oss commit 7b210f96d175c35dd4d93a8ede3b1127b6fe442c Author: Dan Smith Date: Thu Dec 9 14:51:53 2021 -0500 Squashed commit of the following: commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41 Author: Dan Smith Date: Thu Dec 9 14:51:34 2021 -0500 need updates to Python bindings too commit e208dd4d072fd9f18860e84f54d68efdebef49a9 Author: Dan Smith Date: Thu Dec 9 14:41:12 2021 -0500 xml.lite changes from coda-oss commit 169df75cb962580fa63f1be3fbf9189c1fd74915 Author: Dan Smith Date: Wed Dec 8 14:32:37 2021 -0500 latest from coda-oss commit 4a4d621a17bb568fa07453a6a06f08f34efb7b73 Author: Dan Smith Date: Thu Dec 9 14:47:21 2021 -0500 trying to get the "french" SICD unit-test working commit d63e6eace772c8d02616f467d698da48a14568dd Author: Dan Smith Date: Thu Dec 9 14:42:55 2021 -0500 Squashed commit of the following: commit e208dd4d072fd9f18860e84f54d68efdebef49a9 Author: Dan Smith Date: Thu Dec 9 14:41:12 2021 -0500 xml.lite changes from coda-oss commit 169df75cb962580fa63f1be3fbf9189c1fd74915 Author: Dan Smith Date: Wed Dec 8 14:32:37 2021 -0500 latest from coda-oss commit d1a7e6f442aff2530a7fd8078b88a56ce050238f Author: Dan Smith Date: Thu Dec 9 09:29:07 2021 -0500 test_valid_six unittests now working commit d6fb257c92ab8e97e2d2a2164484011c60d2c95d Author: Dan Smith Date: Wed Dec 8 17:45:26 2021 -0500 trying to re-enable more unittests commit c787e98a7f339740389e10f5c5cb3760617f3ed1 Author: Dan Smith Date: Wed Dec 8 16:54:28 2021 -0500 unit-test breaks on Linux commit bd82787be8ae4f4cd463faa2bb6d2cb5c6d7dba6 Author: Dan Smith Date: Wed Dec 8 15:25:31 2021 -0500 Squashed commit of the following: commit c56ac71fcb152d3a802a548b59d90ccc09dfaf83 Author: Dan Smith Date: Wed Dec 8 15:23:00 2021 -0500 merge in develop/SIDD-3.0 commit e621466a38f21d5b66847f5358b4def1fd4ea4ce Author: Dan Smith Date: Wed Dec 8 15:08:04 2021 -0500 merge in develop/8AMPI_PHSI commit 67768ea901bbd983becc4790b478afe0f17828d5 Author: Dan Smith Date: Thu Dec 9 10:02:19 2021 -0500 Squashed commit of the following: commit d1a7e6f442aff2530a7fd8078b88a56ce050238f Author: Dan Smith Date: Thu Dec 9 09:29:07 2021 -0500 test_valid_six unittests now working commit d6fb257c92ab8e97e2d2a2164484011c60d2c95d Author: Dan Smith Date: Wed Dec 8 17:45:26 2021 -0500 trying to re-enable more unittests commit c787e98a7f339740389e10f5c5cb3760617f3ed1 Author: Dan Smith Date: Wed Dec 8 16:54:28 2021 -0500 unit-test breaks on Linux commit bd82787be8ae4f4cd463faa2bb6d2cb5c6d7dba6 Author: Dan Smith Date: Wed Dec 8 15:25:31 2021 -0500 Squashed commit of the following: commit c56ac71fcb152d3a802a548b59d90ccc09dfaf83 Author: Dan Smith Date: Wed Dec 8 15:23:00 2021 -0500 merge in develop/SIDD-3.0 commit e621466a38f21d5b66847f5358b4def1fd4ea4ce Author: Dan Smith Date: Wed Dec 8 15:08:04 2021 -0500 merge in develop/8AMPI_PHSI commit b582c055ba1f0f2532d2f5ad4c97b3cd649e69bd Author: Dan Smith Date: Wed Dec 8 15:26:24 2021 -0500 Squashed commit of the following: commit bd82787be8ae4f4cd463faa2bb6d2cb5c6d7dba6 Author: Dan Smith Date: Wed Dec 8 15:25:31 2021 -0500 Squashed commit of the following: commit c56ac71fcb152d3a802a548b59d90ccc09dfaf83 Author: Dan Smith Date: Wed Dec 8 15:23:00 2021 -0500 merge in develop/SIDD-3.0 commit e621466a38f21d5b66847f5358b4def1fd4ea4ce Author: Dan Smith Date: Wed Dec 8 15:08:04 2021 -0500 merge in develop/8AMPI_PHSI commit c56ac71fcb152d3a802a548b59d90ccc09dfaf83 Author: Dan Smith Date: Wed Dec 8 15:23:00 2021 -0500 merge in develop/SIDD-3.0 commit 33bd17059640d2a02f9766285f05dcdff5de50a8 Author: Dan Smith Date: Mon Dec 13 11:44:54 2021 -0500 nitro release 2.10.7 commit ef19ad2033851682eb3a37bada3a57fcb2b93ef8 Author: Dan Smith Date: Mon Dec 13 11:42:09 2021 -0500 coda-oss release 2021-12-13 commit 86c1856021a5a944c464f9d3cba397a918f68a81 Author: Dan Smith Date: Fri Dec 10 11:57:26 2021 -0500 xml.lite tweaks from coda-oss commit f21f79d3f494e1ca8a5236e95ff5503fdb04e43b Author: Dan Smith Date: Thu Dec 9 17:36:09 2021 -0500 test_xmlParser might be be running in coda-oss commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1 Author: Dan Smith Date: Thu Dec 9 16:09:17 2021 -0500 "private" is part of name mangling commit 351a45f61d63e26fbd379516f073876bf5558050 Author: Dan Smith Date: Thu Dec 9 15:54:13 2021 -0500 more xml.lite updates from coda-oss commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983 Author: Dan Smith Date: Thu Dec 9 15:15:34 2021 -0500 trying to fine the right macro for SWIG commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41 Author: Dan Smith Date: Thu Dec 9 14:51:34 2021 -0500 need updates to Python bindings too commit e208dd4d072fd9f18860e84f54d68efdebef49a9 Author: Dan Smith Date: Thu Dec 9 14:41:12 2021 -0500 xml.lite changes from coda-oss commit 169df75cb962580fa63f1be3fbf9189c1fd74915 Author: Dan Smith Date: Wed Dec 8 14:32:37 2021 -0500 latest from coda-oss * add "noexcept" where possible * by deriving from std::priority_queue, we can avoid rebuilding the heap twice * more "noexcept" to give the compiler more opportunities for optimization * build with GCC 4.9.4 * Squashed commit of the following: commit e4ed163e282a55e68c5bef91ee9a6478e7f4492f Author: Dan Smith Date: Tue Feb 1 11:50:54 2022 -0500 test more AMP8I_PHS8I conversion commit aae247180bd846901f50fb4009a345e01c5d1b52 Author: Dan Smith Date: Tue Feb 1 11:07:28 2022 -0500 correct values for non-debug build commit b4c292692f12d9e07ec10a28743bad3de7d503d6 Author: Dan Smith Date: Tue Feb 1 10:53:13 2022 -0500 check some AMP8I_PHS8I results commit 58442ea8a5249f6689e848ed0e8095d602d3c4e2 Author: Dan Smith Date: Tue Feb 1 09:41:27 2022 -0500 no need for a std::unique_ptr<> to std::vector commit 4fc61416ba01103281ec984a477bc8d7c01c9904 Author: Dan Smith Date: Tue Feb 1 08:49:42 2022 -0500 a copy in std::make_unique<> doesn't seem to work with older compilers commit b0dff2ec21379c18a81c8cc62019fc1e7639fec2 Author: Dan Smith Date: Tue Feb 1 08:36:37 2022 -0500 ComplexToAMP8IPHS8I_KDTree should have been deleted commit 1697d9c8959b2290c974ccdf59eccd2b62c80002 Author: Dan Smith Date: Mon Jan 31 17:29:04 2022 -0500 no need to copy cached std::vector commit 08f6114c456678952badfe3606a89c4acf96a961 Author: Dan Smith Date: Mon Jan 31 17:18:22 2022 -0500 a std::array<> is ALWAYS copied commit acddc2b842f44c23e565c638b0c0a747ce427b17 Author: Dan Smith Date: Mon Jan 31 16:51:39 2022 -0500 swap between nearest-neighbor implementations at compile-time commit 647a606ff92177ac203f8f776807965775bcfba0 Author: Dan Smith Date: Mon Jan 31 16:13:53 2022 -0500 "hide" KDNode in details too commit 51b3edf66850cbd7dd2ccd00d215b18a9a8fd433 Author: Dan Smith Date: Mon Jan 31 15:58:02 2022 -0500 put KDTree in "details" so no one else is tempted to use it commit c59a111fa928f58b9e55ea544a01c5bebcd3fd8a Author: Dan Smith Date: Mon Jan 31 15:54:53 2022 -0500 prepare to make KDTree API look like ComplexToAMPIIPHS9I commit 32eadd4bc9677213e6dd92881c13fe51440e4548 Author: Dan Smith Date: Mon Jan 31 15:47:38 2022 -0500 use a factory function to create ComplexToAMP8IPHS8I commit ef418623ba7e9d2ad4bea3b29dfcb6a178fc0761 Author: Dan Smith Date: Mon Jan 31 15:31:07 2022 -0500 fewer changes on merge commit 078be3468abd9840091af508b4eeca80ba2a3e1b Author: Dan Smith Date: Mon Jan 31 15:17:10 2022 -0500 put ComplexToAMP8IPHS8I in a "details" namespace so no one else is tempted to use it commit 35cd365c79d8147ab16d8a79f2bcbbbb71f072f5 Author: Dan Smith Date: Mon Jan 31 14:48:39 2022 -0500 Wrap the cxfloat->8AMP_PHSI conversion because we've got two different ways of doing it commit 71387289dfa13cee1ebfd109dd581be7d2ac0084 Author: Dan Smith Date: Mon Jan 31 14:22:45 2022 -0500 wrap KDTree cxfloat->AMP_PHS commit 2d4dc0903aa359b35412ed779d612d766c6295a7 Author: Dan Smith Date: Mon Jan 31 14:05:39 2022 -0500 cache the magnitudes w/o an AmplitudeTable commit ebc4a8a76981a852aa8f2189e29787e5d461483f Author: Dan Smith Date: Mon Jan 31 13:35:55 2022 -0500 references instead of pointers commit 45034487a01b4a5eeeadaee90759c2bf34809b89 Author: Dan Smith Date: Mon Jan 31 13:19:26 2022 -0500 building in VS2022 (again) commit 7b5377dbf9ee0aaacbf426b16f556c5069588b2b Author: Dan Smith Date: Mon Jan 31 13:04:38 2022 -0500 Revert "build in VS2022, remove compiler warnings" This reverts commit e4b6eb9c80c7e105c705ca2d6b816cb1894c34f1. commit 3ec4b4a8b315d4bd8dbc8b5e07c38bcf678341d4 Author: Dan Smith Date: Mon Jan 31 12:58:20 2022 -0500 Revert "references instead of pointers" This reverts commit 1324635655a8ed20cfdacec57e8fe54fce8b2a2a. commit 1324635655a8ed20cfdacec57e8fe54fce8b2a2a Author: Dan Smith Date: Mon Jan 31 11:38:57 2022 -0500 references instead of pointers commit e4b6eb9c80c7e105c705ca2d6b816cb1894c34f1 Author: Dan Smith Date: Mon Jan 31 11:32:10 2022 -0500 build in VS2022, remove compiler warnings commit df7fc435daec6ed9fe4d026f01d1f8fa6682e6bf Author: Andrew Hardin Date: Mon Jan 31 07:06:59 2022 -0700 Improve performance of std::complex -> 8-bit amplitude and phase. (#537) This change introduces a new acceleration structure that can efficiently map from std::complex -> 8-bit amplitude and phase. This is accomplished by exploiting the systematic distribution of the 8-bit amplitude and phase values in the original std::complex space. * use KDTree in this branch * add nearest_neighbor test * fix unit tests * slam in "main" * remove transform_async() from coda-oss; std::async() is a bit half-baked * Squashed 'externals/coda-oss/' changes from e87c32b4d..0b7d581fa 0b7d581fa remove transform_async() (#663) f6489b6be Merge branch 'main' into feature/xml.lite_tweaks 836c426a2 use function-pointers so that isConsoleOutput is only checked once 56e3c45b1 move depthPrint() functionality into non-member function in preparation for future changes ddcd26d97 Merge branch 'main' into feature/xml.lite_tweaks 69cc0e506 use the more rigorous create_and_check_datatype() 9efb87558 Merge branch 'main' into feature/hdf5 4d2f2f417 more HighFive unittests (#662) 14191a844 HighFive::create_datatype() goes from C++ to HighFive 98583473f utility routines to read string attributes 1fa75ce81 use the C API to read a string attribute 71e7b69f5 still can't figure out how to read a string attribute :-( e96f37a69 test reading the file attributes a25244519 getAttribute() unittest 8f12a3000 getDataType() unittest 857ff0af3 HighFive utility routines (#661) 1d687db57 writeDataSet() utility overload 106aa6894 sigh ... H5Easy::dump() fill fails on Windows/WAF :-( 2641b60b2 Merge branch 'main' into feature/hdf5 35c19e7e8 change actions to @v3 (#660) 212bbd3a3 works on local machine, but not build server ... ? 7125118b0 dump of 1D vector doesn't work :-( c704db435 sigh ... WAF build still failing :-( 01aae4616 does dump() of a 1D vector work? 76a53c813 comment-out H5 writing :-( 0f0e19aff test_highfive_dump() cb8f73795 trying to get highfive_dump() unittest working w/Windows-WAF 6584a264a does test_highfive_create() work? cde6147ce tweak HighFive wrappers (#659) 316566854 Revert "trying HighFive "write" unittests again" a9ec24ca4 trying HighFive "write" unittests again 585ad49a5 tweak names of utility routines 4c91a4d97 make it easier to read a std::vector and std::vecotr 0217ffa26 readDataSet() now works for 1D data 95e8973f2 trying to get hdf5::lite::load() working 4d294611d "const" correctness 5e6305c3f fix load_complex() 4a134dc5f start work on utility routines to read complex data from HDF5 9d76a7f41 Merge branch 'main' into feature/hdf5 8f9667a24 whitepsace ebd3fc99e Merge branch 'main' into feature/hdf5 40091b069 comment-out writing tests for now ... need to figure our WAF bulid failure 935aa3459 be sure the dataset has real data 114b9bf33 update release notes bd9c0b26c tweak HighFive utility routines acda1ef57 turn off diagnostics around expected failures 22a748840 readDataSet() utility routine for HighFive bd88a8c25 HighFive writeDataSet() utility to work with our SpanRC 6142f5b33 use HighFive routines to write a HDF5 file 5bbf1abaf Use HiveFive routines to get info about the file 84fbc8378 duplicate unittests with H5Easy f1f054c03 Merge branch 'main' into feature/hdf5 9b63ca470 fix directory names f6f826689 fix directory names 7aeb82c33 Merge branch 'main' into feature/hdf5 d028baaeb hook up HighFive header-only library (#653) 3083b0a31 Revert "HighFive 2.6.2" 246985a7f Revert ""build" HighFive HDF5 library" a8b75a586 Revert "turn off HighFive Boost support" ec68d5f83 Revert "Add HighFive unittests" f1f85b9e7 Revert "get test_high_five_base more-or-less compiling" 5ea634ee1 Revert "more work on getting HighFive unittests to build" ecc45433c more work on getting HighFive unittests to build bb194788a get test_high_five_base more-or-less compiling d42bde000 Add HighFive unittests ddc86bb32 turn off HighFive Boost support b255122d4 "build" HighFive HDF5 library 396cc3ef2 HighFive 2.6.2 5e5f9d9c0 Merge branch 'main' into feature/hdf5 ee938b4a5 changes from SIX bb764df90 Merge branch 'main' into feature/xml.lite_tweaks de2a24380 make derived classes 'final' if possible 14e19bcd2 Change xml lite function to virtual (#645) 8f42ac8e9 Merge branch 'main' into feature/xml.lite_tweaks 18ad90645 hdf5Write unittest 3462e1179 createFile() and writeFile() overloads ecee81d53 fix typos 197eecfa6 sketch-out hdf5::lite::writeFile() bd2311795 use SpanRC for writeFile(), not yet implemented ea9af7510 simple SpanRC to hold a 2D-size and pointer 027c19ee8 createFile() unittest 1f9d07ecb hook up createFile() 8c7e4473f start hooking up HDF5 writing 146e0bea3 Merge branch 'main' into feature/hdf5 88ca9fcb7 Merge branch 'main' into feature/hdf5 42b604b46 Squashed commit of the following: 10ee602c2 Merge branch 'main' into feature/hdf5 67aa42b69 restore changes from "main" 8bbfcbfbf unittests can be simplified to match fewer "view" classes 126bb802e Merge branch 'main' into feature/hdf5 3f8ba7a42 again, don't need a class just to convert from std::vector<> to std::span<> 24c2b489c Squashed commit of the following: 2703c119d Squashed commit of the following: 9d5228a2b don't need an entire class just to convert a std::vector<> into std::span<> 51bc931dc Merge branch 'main' into feature/hdf5 a84f25816 Squashed commit of the following: c4d2ed696 add missing #include guards, fix type in existing #include guard d541525a0 use a single ComplexViewConstIterator for all views 86e6a459f CODA_OSS_disable_warning causes GCC errors :-( 5d4b9c2cb only need an custom iterator for ComplexSpansView d9f0fb128 hook up iterators b9329e4db initial pass at a ComplexViewConstIterator 635238873 remove compiler warning about unused "constexpr" variables b39f6096f use the casing from H5 to make copy/pasting code slightly easier 0887b13eb Merge branch 'main' into feature/hdf5 bd07df1ca Consistent casing for Dataset, Datatype, Dataspace 7acd30ee2 tweak hdf5.lite dependencies 38ab914df Jupyter notebook for creating H5 files 95a040e0b _small.h5 is now (correctly) FLOAT32 107e7c487 make a simple values() member function to avoid template magic e1feca919 use TEST_SPECIFIC_EXCEPTION macro instead of try/catch 738333688 readDatasetT() now throws for the wrong buffer type 6b2cc2529 Merge branch 'feature/hdf5' of github.com:mdaus/coda-oss into feature/hdf5 310f8fd3d can't get template magic right for copy_axis() 86b306d59 stepping through copy ctors in the debugger is annoying f243e92d6 trying to make wrong type of buffer fail 2b10d9652 read in new sample file a28e59d8c help the compiler with type deduction 49bf5e9bc nested_complex_float_data_small.h5 e029325fc utility routines to "deconstruct" and array of std::complex dede3bd39 Merge branch 'main' into feature/hdf5 904b1ef5e tweak class names, make_() and copy() utility routines 8237b9efb make it harder to pass the wrong types to ComplexViews 4d9aeda2c ComplexArrayView and ComplexParallelView utility classes f5e367dfa test std::span> a4a2844f2 read in the nested "i" and "r" data 115615265 sample file has subgroups 8e1b7869a Merge branch 'feature/hdf5' of github.com:mdaus/coda-oss into feature/hdf5 9f4232a1d update sample H5 file 8c55db73a walk through HDF5 sub-groups 7775ed9c4 Update 123_barfoo_catdog_cx.h5 677975d7c Matlab code to create sample H5 file a0e7dfe07 Update test_hdf5info.cpp 0b67e1602 pass __FILE__ and __LINE__ from calling site for a more accurate exception message 86a677321 skeleton for more sample data 85f79b099 Merge branch 'main' into feature/hdf5 18088e942 Merge branch 'main' into feature/hdf5 3a1d17692 Merge branch 'main' into feature/hdf5 1755c69d7 Merge branch 'main' into feature/hdf5 9ad015432 No more "11" suffix on exception names c20d96251 Squashed commit of the following: c88cee999 other values to be filled-in bca4a4ecd incorporation NamedObject from HDF5 docs 61fa68f72 groupInfo() 460e7d766 datasetInfo() 14eb9b764 start filling in DatasetInfo afe5f1c3a start to fill in DatasetInfo 77a968c72 start filling in GroupInfo d81bcdfd9 openGroup() to open groups (loc) a0cd29469 comment-out "dataset" unittest for now 86e006024 begin filling in FileInfo 366dda6ab a return_type_of utility is needed to deduce the return type e21928263 explicitly pass return type to template 4937ccd11 template to reduce boilerplate when calling try_catch_H5Exceptions b3b5ebde7 use new exception utility routines ea1c03ef0 put exception handling/conversion in a utility routine 819a99d39 utility routine for exception handling 6f34eea97 put utilities in a separate file for easier reuse fcbde4f24 break utility routines into smaller pieces for easier reuse 52358ea8a WIN32 no longer automatically defined? 5a4286472 Revert "build HDF5 with C89" 680e599e9 build HDF5 with C89 a87a07121 Merge branch 'main' into feature/hdf5 8447c1a90 Revert "sym-links instead of copying files" db3b5e12b Merge branch 'main' into feature/xml.lite_tweaks fb60b5696 Merge branch 'main' into feature/hdf5 5110a5cc8 Comments about _u and _q 1a937d32c Merge branch 'main' into feature/xml.lite_tweaks fa06f04d7 get ready for hdf5.lite enhancdements b040c7c43 sym-links instead of copying files aa431bb47 use _u for xml::lite::Uri 3d0c6d58c fix case-sensitive #include filename 93dcd0e52 operator() for getElementByName() 75a93af85 more operator[] overloads to make attribute management easier 4ab8216f8 user-defined string literals to remove some noise around xml::lite::QName f82f0b0fc Merge branch 'main' into feature/xml.lite_tweaks ae30e3644 Merge branch 'feature/xml.lite_tweaks' of github.com:mdaus/coda-oss into feature/xml.lite_tweaks ffdd9beb0 simplify attribute creation 9bf5414f5 simplify attribute creation 82d7a4e95 SWIG gets confused about namespaces 7a61d0741 fix bug on Element ctor uncovered by unittest fdd7e58c1 QName is also in the xerces namespace which confuses SWIG bindings a325b7053 operator+=() overload for addChild daf30e6c0 Merge branch 'feature/xml.lite_tweaks' of github.com:mdaus/coda-oss into feature/xml.lite_tweaks b887d2b47 provide overloads for Element& rather than creating new "reference" types 1fa6bba38 rename test_xmleasy.cpp 7c8c9e0f1 += overload 850da6f63 overload for std::string 4547fc5a7 use UIT-8 strings for characterData 4723462a3 convenient addChild() overloads e48720753 copy over ElementReference from xml.easy a4ca30a0d Merge branch 'main' into feature/xml.lite_tweaks 6ae9f0b71 Revert "check-in of new xml.easy (to move code between computers)" f7466a6d7 Revert "simple routines for single element" a5490230d Revert "make some operators simplier ways of calling functions" c9a25630a Revert "get document creation working" 8af8710b0 Revert "free functions instead of member functions" 16c3847cb Revert "ElementReference distinct from Element" 7d68e156f Revert "ElementMutableReference" 00eb2a282 Merge branch 'main' into feature/xml.lite_tweaks a42969c1f ElementMutableReference a20ae9355 ElementReference distinct from Element 14eeeea0b free functions instead of member functions 4aae014b3 get document creation working 883569269 make some operators simplier ways of calling functions 053bd1212 simple routines for single element 8bf701a2e check-in of new xml.easy (to move code between computers) 41f959051 unittests for creating XML documents from scratch 9752d50ae Merge branch 'main' into feature/xml.lite_tweaks 1531d5709 by default, don't validate strings passed to Uri() 46d13d4bf Merge branch 'master' into feature/xml.lite_tweaks 39b547d32 remove more vestiges of Expat and LibXML ec8274d52 remove LibXML and Expat as they're no longer used/supported. 20eeefeef Merge branch 'master' into feature/xml.lite_tweaks 95074b9b1 update for newer Intel compiler 7024f71e1 Merge branch 'master' into feature/xml.lite_tweaks 57b1cbc83 Merge branch 'master' into feature/xml.lite_tweaks 4b67561c3 remove validate() overload that nobody is using fa15f1e5d Squashed commit of the following: 1484a9090 test the new validate() API 470da70fb hookup StringStreamT routines 2cddf2504 begin hooking up validate() overloads 1b5d910f3 overload validate() for UTF-8 and Windows-1252 03309b8c9 Squashed commit of the following: b72c6c5bf older compiler doesn't like our make_unique af8f00307 validate UTF-8 XML on Linux 211188613 unit-test for LEGACY XML validation 3c1169d2b Squashed commit of the following: 3afff19ca std::filesystem::path for FileInputStreamOS 908d452f8 WIP: validate all of our sample XML files 00f9bb16b validate against a XML schema 243d8c356 Merge branch 'master' into feature/xml.lite_tweaks 2815d707d fix to work with SWIG bindings. :-( 460862132 trying (again) to remove vestiages of old code e3c83a858 Revert "new code should use UTF-8" 811207c92 new code should use UTF-8 0ffd835f9 Squashed commit of the following: 1e7e03ded Merge branch 'master' into feature/xml.lite_tweaks c1d806aff Merge branch 'master' into feature/xml.lite_tweaks 850d3c811 str::strip() that can be easier to use than str::trim() 580ba9c8c explicitly =delete move 2b39831a8 Squashed commit of the following: 39eebdc23 Merge branch 'master' into feature/xml.lite_tweaks 9adf86cba force calling new UTF-8 write() routines ea61b6204 Merge branch 'master' into feature/xml.lite_tweaks 8a34583fa overload to take schemaPaths as filesystem::path 8671b442f parse XML embedded in a binary file ec4a902f1 updates from xerces.lite 80dc4d963 updates from xerces.lite 549766d6c Attributes::contains() no longer catches an exception 8a645ceac need "sys/" when building in other environments 36af08269 super-simple URI validation 78ef28a3e SWIG bindings are a PITA! :-( e9cba8491 SWIG needs help with Uri 8a8d8dc07 another routines used by pre-build SWIG bindings 818e1ec5d pre-build SWIG bindings use getElementByTagName() member function 067cac5d8 old compiler gets confused on unadorned QName ba92c0ae7 more use of Uri and QName 446c7d17a use QName in new code d6f8b0c83 more direct use of QName 90fff1c73 use xml::lite::QName instead of tuple 646cbb5ed more direct use of QName and Uri ba589ea3b make QName more robust bab0ee8b5 createElement() -> addNewElement() e3a145747 grab changes from six-library 32285e95c Merge branch 'master' into feature/xml.lite_tweaks 9f79f0bf6 Merge branch 'master' into feature/xml.lite_tweaks a12bbc32c make it easier to create new Elements with a value fc9967f98 make it easy for callers to addChild() keep a reference to the Element 4627766b7 be sure test_xmlparser works in "externals" of other projects bf2276396 "private" is part of the name-mangling fad92bcc8 making sure copy-ctor is implemented f90fdcead consolidate common XML test code 9fc53f2d5 use str:: utility for casting 6da6f794b still trying to find the right macro for SWIG 0c1b86c56 still trying to fix SWIG fdc6fc9bd trying to fix SWIG build error 7835e8c27 SWIG needs copy-ctor 585695942 disable copy/assignment for Element, it's probably almost always wrong 391fed613 fix double-delete caused by copying 61790fe69 retry parsing XML with Windows-1252 if first parse() fails 63cffac59 change string_encoding to match coda-oss style of PascalCase 010479bbe read an XML file we know is wrongly encoded as Windows-1252 9a0505062 more references instead of pointers 2d44b6951 Reading Windows-1252 w/o "encoding" fails 63dc7b076 read Windows-1252 too c9434c9cb test as UIT-8 too f310ccf0c get reading from UTF-8 XML working on Windows 1fa39c2be get testReadUtf8XmlFile working on Linux 1a83cd815 sys::Path is too much trouble right now ed60aa22c unit-test to read XML from a file a9336db7c Squashed commit of the following: 0825beb0d Merge branch 'master' into feature/xml.lite_tweaks c618489be Merge branch 'master' into feature/xml.lite_tweaks e8e4b8fe1 determine string_encoding based on platform 1f43bcfc2 create a new Element by using the platform to determine "characterData" encoding 961bef66b Merge branch 'master' into feature/xml.lite_tweaks e9798a5cb fix static_assert() 6f7772874 Merge branch 'master' into feature/xml.lite_tweaks b98d4f5a9 Merge branch 'master' into feature/xml.lite_tweaks 1b5abba2a The (old) version of SWIG we're using doesn't like certain C++11 features. 53bdeabaf Merge branch 'master' into feature/xml.lite_tweaks 60cf8ae80 "" doesn't work with decltype() in older C++ 97e72477a reduce getValue() overloads by making "key" a template argument 5e6373e55 reduce code duplication f9e7cfeee provide castValue instead of getValue(T&) cbd0bd8f2 castValue throws instead of returning a bool like getValue(T&) 87c7514fc Merge branch 'master' into feature/xml.lite_tweaks 10cc61223 make getElement*() consistent for zero or >1 results f5b137e3c Merge branch 'master' into feature/xml.lite_tweaks 1765efc62 allow clients to specify toType() and toString() for getValue() and setValue() df8b746e1 allow clients to specify their own toType/toString routines 66702726a Merge branch 'master' into feature/xml.lite_tweaks 6956311f1 Merge branch 'master' into feature/xml.lite_tweaks d505f3593 Merge branch 'master' into feature/xml.lite_tweaks fbd106115 catch a BadCastException and return false from getValue() 3a78377b5 use a template to reduce duplicated code 0ad4b8606 Merge branch 'master' into feature/xml.lite_tweaks a848aa3a2 get & set the characer data as a type f3ee1ee12 utility routines to set an attribute value 595227683 templates to get an attribute value convert to a specific type 06639227b miised a change in last commit 1aa458ef8 add getValue() overloads that return true/false rather than throwing faa6d3075 added getElementByTagName() overloads as that's a very common use-case git-subtree-dir: externals/coda-oss git-subtree-split: 0b7d581fa62a58ca730fbbf58d24c8ef8b32f764 * Squashed 'externals/nitro/' changes from c8ecbe9ae..90c6263e2 90c6263e2 latest from coda-oss (#544) 90d513ac5 latest from coda-oss (#543) git-subtree-dir: externals/nitro git-subtree-split: 90c6263e218e20f9d974520d955638ec35ac1085 * copy_externals * use our own `struct` rather than std::pair<> * from_AMP8I_PHS8I() is a goofy name * overloads to avoid an `if`-check inside of a loop * overload so it's no longer necessary to pass `nullptr` * No need to make "nodes" just to iterate through the data again * avoid checking pAmplitudeTable inside a loop * force include pch.h * utility to generate all 256 `uint8_t` values * overloads for NULL (none) and non-NULL (reference) amplitude table * merge develop/byteswap * remove cutoff, it's not needed in C++17 * AmplitudeTable should be clone()'d, not copyied * AmplitudeTable should be clone()'d, not copyied * Put LUT and AmplitudeTable in their own .H file; Types.h is big * use Amp8iPhs8iLookup_t type * simplify code to create lookup table * cache the lookup table on AmplitudeTable * removed dead code * use toComplex() and fromComplex() as AMP8I_PHS8I is a mouth-full * Move AMP8I/PHS8I structures to SIDD for better code structure * simplify creating a ComplexToAMP8IPHS8I instance * reduce checking for a NULL AmplitudeTable* * fix build error due to header file rearrangment * simplify special routine for unit-testing * don't need "static" utility routines anymore * no reason not to allow move for ComplexToAMP8IPHS8I * Squashed commit of the following: commit 67d0bc78b1a93d02fc496ec755fc794060ab5bb5 Merge: 42f479813 a2cb168ce Author: Dan Smith Date: Fri Jun 16 10:37:57 2023 -0400 Merge branch 'develop/complex_short' of github.com:ngageoint/six-library into develop/complex_short commit 42f479813d7b2d431753028cab5ff5c4874bb62c Author: Dan Smith Date: Fri Jun 16 10:37:43 2023 -0400 Parameter::operator==() must a member function for existing SWIG bindings commit a2cb168cebbf0b89348d106be8a878fb6746f155 Author: Dan Smith Date: Fri Jun 16 10:32:22 2023 -0400 renames from CODA-OSS commit 68d184a89f899a709c6c7e54f858e4a8a4ed2955 Author: Dan Smith Date: Fri Jun 16 10:15:28 2023 -0400 figure out ComplexInteger in SIX rather than CODA-OSS commit 802087c892ecc653c0cd0086ec888d622c9192f8 Author: Dan Smith Date: Fri Jun 16 10:01:05 2023 -0400 separate .H file for complex commit 4d24ae394a290e21f074614ee95f46a182c43e33 Author: Dan Smith Date: Fri Jun 16 09:54:05 2023 -0400 remove unneeded #include of types/Complex.h commit e021d71c2d25641afbfe7d6741f60b2c745bd12d Author: Dan Smith Date: Fri Jun 16 09:49:48 2023 -0400 zinteger -> ComplexInteger commit 91599f83e4a8d1e3e8fe77d54bca4cb6f85ea692 Author: Dan Smith Date: Fri Jun 16 09:38:53 2023 -0400 complex.h -> Complex.h from CODA-OSS commit b3653cc75b07fb0415e2a18303058e57c31718b8 Merge: 786223e8c 6e34e8717 Author: Dan Smith Date: Thu Jun 15 16:11:31 2023 -0400 Merge branch 'main' into develop/complex_short commit 786223e8c0ebc05ca46e7c55eac8a26678ff2bff Author: Dan Smith Date: Thu Jun 15 16:04:31 2023 -0400 use CODA_OSS_types_unique_zinteger commit f143d3a53c4cdce580958fae0ef5588bb12cbda5 Author: Dan Smith Date: Thu Jun 15 15:54:40 2023 -0400 Squashed commit of the following: commit 011ba83af6202c4a5358c366ac0e88edcbfd6986 Merge: 7390b8b19 4a21b2db5 Author: Dan Smith Date: Thu Jun 15 15:37:33 2023 -0400 Merge branch 'main' into develop/sync_externals commit 7390b8b19f4f9d21d0ffc34ae9906cea2227936d Merge: 7f79e6d6f b902f6c17 Author: Dan Smith Date: Thu Jun 15 14:21:10 2023 -0400 Merge commit 'b902f6c1743778d8fceeee5b3209ebca2370312a' into develop/sync_externals commit b902f6c1743778d8fceeee5b3209ebca2370312a Author: Dan Smith Date: Thu Jun 15 14:21:10 2023 -0400 Squashed 'externals/coda-oss/' changes from f4d42005f..704d6867f 704d6867f beef-up our complex type (#687) 47c1c1cd6 check is_absolute() for URLs (#686) c042373e1 be sure our Path::isAbolute() matches std::filesystem::path::absolute() (#684) ad10286bc volatile is about "special" memory, not threading (#685) git-subtree-dir: externals/coda-oss git-subtree-split: 704d6867f959f60e3e62c44681a3fb1f7abc99bf commit 7f79e6d6fb8972e5074e582aa4c3214e9a524459 Author: Dan Smith Date: Thu Jun 15 14:21:06 2023 -0400 latest from CODA-OSS commit 24678b33f4aab533af0d807d6706f8587bd1c103 Merge: 9eb95e3aa 35b59b9a0 Author: Dan Smith Date: Thu Jun 15 14:20:30 2023 -0400 Merge branch 'main' into develop/sync_externals commit 9eb95e3aad1562b0d7915cf48db1b61a337a3878 Author: Dan Smith Date: Tue Jun 13 17:51:55 2023 -0400 latest from CODA-OSS and NITRO commit 1bd99042ef18b76df9da27d946b5616d9dd254b1 Merge: ec161c5b3 c59d69c06 Author: Dan Smith Date: Tue Jun 13 17:51:40 2023 -0400 sync_externals commit c59d69c06eda40c7295ab607fdc8a5dad7d2c1b1 Author: Dan Smith Date: Tue Jun 13 17:51:34 2023 -0400 Squashed 'externals/nitro/' changes from c8ecbe9ae..3f01809fa 3f01809fa latest from coda-oss (#557) 471fb3fc1 Update test_j2k_loading++.cpp b12caf2fc latest from CODA-OSS (#556) 0cd432624 use sys::make_span (#555) 05dae18a3 patch to build other projects 8f974e995 NITRO-2.11.3 (#554) 870aa6afd update to coda-oss 2023-06-05 (#553) 2fd7a0bfa latest from coda-oss (#552) 0eecce004 invoke() utility to reduce code duplication (#550) 59fb02fe9 latest from coda-oss (#551) 9fbf2b7b8 Fill out adapter free block which is used for nitf decompression (#549) 089ba0b5b latest from coda-oss 3b52f0025 latest from coda-oss (#547) 90c6263e2 latest from coda-oss (#544) 90d513ac5 latest from coda-oss (#543) git-subtree-dir: externals/nitro git-subtree-split: 3f01809fae7d471aa0f1594fc5eec1e3111cd710 commit 272cae451cbe3ad6820d1221aafe375d77b1ba04 Author: Dan Smith Date: Tue Jun 13 17:51:29 2023 -0400 Squashed 'externals/coda-oss/' changes from e87c32b4d..f4d42005f f4d42005f fix build error in NITRO ff11a5557 keep using std::complex for now (#682) c88b9c053 types::complex (#681) d1244a080 don't need our own make_unique in C++14 (#680) aeec0131c assert()s for mem::CopyablePtr (#679) 72b0ebd60 add types::complex_short (#678) 932130a58 patch to build other projects c00c1f203 coda-oss release 2023-06-06 (#677) ef54bbcd5 remove more compiler warnings (#676) dadfc5ce6 distinguish between byte-swapping a buffer and single value (#674) 90187f6cd more xml.lite tweaks for SIDD-3.0/ISM (#675) eb9960772 stronger type-checking for byteSwap() (#673) ff4f820ed xml.lite tweaks to support SIDD 3.0 ISM (#672) b1de8c0e5 std::byte should be a unique type (#671) c05bf9a02 allow enums to be byte-swapped too 1f9fd88d6 remove spurious 47684c45b byteSwap now uses byte buffers (#670) cbc659db2 add swapBytes() utility from SIX (#669) 891481b64 simplify byte-swapping (#668) 540ae763e more byteSwap() tweaks 0774c03c4 threaded byteSwap() (#667) d156370d3 swapping a single-byte value makes no sense c120e3255 be sure parameter is used to avoid compiler warning e85ec9331 --output-on-failure for CTest (#666) e80376197 turn off "there is no warning number" warning c5f0a5d15 A C-string may not be NULL-terminated (#665) 0c5eb29ae use platform-specific routines for byteSwap() (#664) 0b7d581fa remove transform_async() (#663) f6489b6be Merge branch 'main' into feature/xml.lite_tweaks 836c426a2 use function-pointers so that isConsoleOutput is only checked once 56e3c45b1 move depthPrint() functionality into non-member function in preparation for future changes ddcd26d97 Merge branch 'main' into feature/xml.lite_tweaks 69cc0e506 use the more rigorous create_and_check_datatype() 9efb87558 Merge branch 'main' into feature/hdf5 4d2f2f417 more HighFive unittests (#662) 14191a844 HighFive::create_datatype() goes from C++ to HighFive 98583473f utility routines to read string attributes 1fa75ce81 use the C API to read a string attribute 71e7b69f5 still can't figure out how to read a string attribute :-( e96f37a69 test reading the file attributes a25244519 getAttribute() unittest 8f12a3000 getDataType() unittest 857ff0af3 HighFive utility routines (#661) 1d687db57 writeDataSet() utility overload 106aa6894 sigh ... H5Easy::dump() fill fails on Windows/WAF :-( 2641b60b2 Merge branch 'main' into feature/hdf5 35c19e7e8 change actions to @v3 (#660) 212bbd3a3 works on local machine, but not build server ... ? 7125118b0 dump of 1D vector doesn't work :-( c704db435 sigh ... WAF build still failing :-( 01aae4616 does dump() of a 1D vector work? 76a53c813 comment-out H5 writing :-( 0f0e19aff test_highfive_dump() cb8f73795 trying to get highfive_dump() unittest working w/Windows-WAF 6584a264a does test_highfive_create() work? cde6147ce tweak HighFive wrappers (#659) 316566854 Revert "trying HighFive "write" unittests again" a9ec24ca4 trying HighFive "write" unittests again 585ad49a5 tweak names of utility routines 4c91a4d97 make it easier to read a std::vector and std::vecotr 0217ffa26 readDataSet() now works for 1D data 95e8973f2 trying to get hdf5::lite::load() working 4d294611d "const" correctness 5e6305c3f fix load_complex() 4a134dc5f start work on utility routines to read complex data from HDF5 9d76a7f41 Merge branch 'main' into feature/hdf5 8f9667a24 whitepsace ebd3fc99e Merge branch 'main' into feature/hdf5 40091b069 comment-out writing tests for now ... need to figure our WAF bulid failure 935aa3459 be sure the dataset has real data 114b9bf33 update release notes bd9c0b26c tweak HighFive utility routines acda1ef57 turn off diagnostics around expected failures 22a748840 readDataSet() utility routine for HighFive bd88a8c25 HighFive writeDataSet() utility to work with our SpanRC 6142f5b33 use HighFive routines to write a HDF5 file 5bbf1abaf Use HiveFive routines to get info about the file 84fbc8378 duplicate unittests with H5Easy f1f054c03 Merge branch 'main' into feature/hdf5 9b63ca470 fix directory names f6f826689 fix directory names 7aeb82c33 Merge branch 'main' into feature/hdf5 d028baaeb hook up HighFive header-only library (#653) 3083b0a31 Revert "HighFive 2.6.2" 246985a7f Revert ""build" HighFive HDF5 library" a8b75a586 Revert "turn off HighFive Boost support" ec68d5f83 Revert "Add HighFive unittests" f1f85b9e7 Revert "get test_high_five_base more-or-less compiling" 5ea634ee1 Revert "more work on getting HighFive unittests to build" ecc45433c more work on getting HighFive unittests to build bb194788a get test_high_five_base more-or-less compiling d42bde000 Add HighFive unittests ddc86bb32 turn off HighFive Boost support b255122d4 "build" HighFive HDF5 library 396cc3ef2 HighFive 2.6.2 5e5f9d9c0 Merge branch 'main' into feature/hdf5 ee938b4a5 changes from SIX bb764df90 Merge branch 'main' into feature/xml.lite_tweaks de2a24380 make derived classes 'final' if possible 14e19bcd2 Change xml lite function to virtual (#645) 8f42ac8e9 Merge branch 'main' into feature/xml.lite_tweaks 18ad90645 hdf5Write unittest 3462e1179 createFile() and writeFile() overloads ecee81d53 fix typos 197eecfa6 sketch-out hdf5::lite::writeFile() bd2311795 use SpanRC for writeFile(), not yet implemented ea9af7510 simple SpanRC to hold a 2D-size and pointer 027c19ee8 createFile() unittest 1f9d07ecb hook up createFile() 8c7e4473f start hooking up HDF5 writing 146e0bea3 Merge branch 'main' into feature/hdf5 88ca9fcb7 Merge branch 'main' into feature/hdf5 42b604b46 Squashed commit of the following: 10ee602c2 Merge branch 'main' into feature/hdf5 67aa42b69 restore changes from "main" 8bbfcbfbf unittests can be simplified to match fewer "view" classes 126bb802e Merge branch 'main' into feature/hdf5 3f8ba7a42 again, don't need a class just to convert from std::vector<> to std::span<> 24c2b489c Squashed commit of the following: 2703c119d Squashed commit of the following: 9d5228a2b don't need an entire class just to convert a std::vector<> into std::span<> 51bc931dc Merge branch 'main' into feature/hdf5 a84f25816 Squashed commit of the following: c4d2ed696 add missing #include guards, fix type in existing #include guard d541525a0 use a single ComplexViewConstIterator for all views 86e6a459f CODA_OSS_disable_warning causes GCC errors :-( 5d4b9c2cb only need an custom iterator for ComplexSpansView d9f0fb128 hook up iterators b9329e4db initial pass at a ComplexViewConstIterator 635238873 remove compiler warning about unused "constexpr" variables b39f6096f use the casing from H5 to make copy/pasting code slightly easier 0887b13eb Merge branch 'main' into feature/hdf5 bd07df1ca Consistent casing for Dataset, Datatype, Dataspace 7acd30ee2 tweak hdf5.lite dependencies 38ab914df Jupyter notebook for creating H5 files 95a040e0b _small.h5 is now (correctly) FLOAT32 107e7c487 make a simple values() member function to avoid template magic e1feca919 use TEST_SPECIFIC_EXCEPTION macro instead of try/catch 738333688 readDatasetT() now throws for the wrong buffer type 6b2cc2529 Merge branch 'feature/hdf5' of github.com:mdaus/coda-oss into feature/hdf5 310f8fd3d can't get template magic right for copy_axis() 86b306d59 stepping through copy ctors in the debugger is annoying f243e92d6 trying to make wrong type of buffer fail 2b10d9652 read in new sample file a28e59d8c help the compiler with type deduction 49bf5e9bc nested_complex_float_data_small.h5 e029325fc utility routines to "deconstruct" and array of std::complex dede3bd39 Merge branch 'main' into feature/hdf5 904b1ef5e tweak class names, make_() and copy() utility routines 8237b9efb make it harder to pass the wrong types to ComplexViews 4d9aeda2c ComplexArrayView and ComplexParallelView utility classes f5e367dfa test std::span> a4a2844f2 read in the nested "i" and "r" data 115615265 sample file has subgroups 8e1b7869a Merge branch 'feature/hdf5' of github.com:mdaus/coda-oss into feature/hdf5 9f4232a1d update sample H5 file 8c55db73a walk through HDF5 sub-groups 7775ed9c4 Update 123_barfoo_catdog_cx.h5 677975d7c Matlab code to create sample H5 file a0e7dfe07 Update test_hdf5info.cpp 0b67e1602 pass __FILE__ and __LINE__ from calling site for a more accurate exception message 86a677321 skeleton for more sample data 85f79b099 Merge branch 'main' into feature/hdf5 18088e942 Merge branch 'main' into feature/hdf5 3a1d17692 Merge branch 'main' into feature/hdf5 1755c69d7 Merge branch 'main' into feature/hdf5 9ad015432 No more "11" suffix on exception names c20d96251 Squashed commit of the following: c88cee999 other values to be filled-in bca4a4ecd incorporation NamedObject from HDF5 docs 61fa68f72 groupInfo() 460e7d766 datasetInfo() 14eb9b764 start filling in DatasetInfo afe5f1c3a start to fill in DatasetInfo 77a968c72 start filling in GroupInfo d81bcdfd9 openGroup() to open groups (loc) a0cd29469 comment-out "dataset" unittest for now 86e006024 begin filling in FileInfo 366dda6ab a return_type_of utility is needed to deduce the return type e21928263 explicitly pass return type to template 4937ccd11 template to reduce boilerplate when calling try_catch_H5Exceptions b3b5ebde7 use new exception utility routines ea1c03ef0 put exception handling/conversion in a utility routine 819a99d39 utility routine for exception handling 6f34eea97 put utilities in a separate file for easier reuse fcbde4f24 break utility routines into smaller pieces for easier reuse 52358ea8a WIN32 no longer automatically defined? 5a4286472 Revert "build HDF5 with C89" 680e599e9 build HDF5 with C89 a87a07121 Merge branch 'main' into feature/hdf5 8447c1a90 Revert "sym-links instead of copying files" db3b5e12b Merge branch 'main' into feature/xml.lite_tweaks fb60b5696 Merge branch 'main' into feature/hdf5 5110a5cc8 Comments about _u and _q 1a937d32c Merge branch 'main' into feature/xml.lite_tweaks fa06f04d7 get ready for hdf5.lite enhancdements b040c7c43 sym-links instead of copying files aa431bb47 use _u for xml::lite::Uri 3d0c6d58c fix case-sensitive #include filename 93dcd0e52 operator() for getElementByName() 75a93af85 more operator[] overloads to make attribute management easier 4ab8216f8 user-defined string literals to remove some noise around xml::lite::QName f82f0b0fc Merge branch 'main' into feature/xml.lite_tweaks ae30e3644 Merge branch 'feature/xml.lite_tweaks' of github.com:mdaus/coda-oss into feature/xml.lite_tweaks ffdd9beb0 simplify attribute creation 9bf5414f5 simplify attribute creation 82d7a4e95 SWIG gets confused about namespaces 7a61d0741 fix bug on Element ctor uncovered by unittest fdd7e58c1 QName is also in the xerces namespace which confuses SWIG bindings a325b7053 operator+=() overload for addChild daf30e6c0 Merge branch 'feature/xml.lite_tweaks' of github.com:mdaus/coda-oss into feature/xml.lite_tweaks b887d2b47 provide overloads for Element& rather than creating new "reference" types 1fa6bba38 rename test_xmleasy.cpp 7c8c9e0f1 += overload 850da6f63 overload for std::string 4547fc5a7 use UIT-8 strings for characterData 4723462a3 convenient addChild() overloads e48720753 copy over ElementReference from xml.easy a4ca30a0d Merge branch 'main' into feature/xml.lite_tweaks 6ae9f0b71 Revert "check-in of new xml.easy (to move code between computers)" f7466a6d7 Revert "simple routines for single element" a5490230d Revert "make some operators simplier ways of calling functions" c9a25630a Revert "get document creation working" 8af8710b0 Revert "free functions instead of member functions" 16c3847cb Revert "ElementReference distinct from Element" 7d68e156f Revert "ElementMutableReference" 00eb2a282 Merge branch 'main' into feature/xml.lite_tweaks a42969c1f ElementMutableReference a20ae9355 ElementReference distinct from Element 14eeeea0b free functions instead of member functions 4aae014b3 get document creation working 883569269 make some operators simplier ways of calling functions 053bd1212 simple routines for single element 8bf701a2e check-in of new xml.easy (to move code between computers) 41f959051 unittests for creating XML documents from scratch 9752d50ae Merge branch 'main' into feature/xml.lite_tweaks 1531d5709 by default, don't validate strings passed to Uri() 46d13d4bf Merge branch 'master' into feature/xml.lite_tweaks 39b547d32 remove more vestiges of Expat and LibXML ec8274d52 remove LibXML and Expat as they're no longer used/supported. 20eeefeef Merge branch 'master' into feature/xml.lite_tweaks 95074b9b1 update for newer Intel compiler 7024f71e1 Merge branch 'master' into feature/xml.lite_tweaks 57b1cbc83 Merge branch 'master' into feature/xml.lite_tweaks 4b67561c3 remove validate() overload that nobody is using fa15f1e5d Squashed commit of the following: 1484a9090 test the new validate() API 470da70fb hookup StringStreamT routines 2cddf2504 begin hooking up validate() overloads 1b5d910f3 overload validate() for UTF-8 and Windows-1252 03309b8c9 Squashed commit of the following: b72c6c5bf older compiler doesn't like our make_unique af8f00307 validate UTF-8 XML on Linux 211188613 unit-test for LEGACY XML validation 3c1169d2b Squashed commit of the following: 3afff19ca std::filesystem::path for FileInputStreamOS 908d452f8 WIP: validate all of our sample XML files 00f9bb16b validate against a XML schema 243d8c356 Merge branch 'master' into feature/xml.lite_tweaks 2815d707d fix to work with SWIG bindings. :-( 460862132 trying (again) to remove vestiages of old code e3c83a858 Revert "new code should use UTF-8" 811207c92 new code should use UTF-8 0ffd835f9 Squashed commit of the following: 1e7e03ded Merge branch 'master' into feature/xml.lite_tweaks c1d806aff Merge branch 'master' into feature/xml.lite_tweaks 850d3c811 str::strip() that can be easier to use than str::trim() 580ba9c8c explicitly =delete move 2b39831a8 Squashed commit of the following: 39eebdc23 Merge branch 'master' into feature/xml.lite_tweaks 9adf86cba force calling new UTF-8 write() routines ea61b6204 Merge branch 'master' into feature/xml.lite_tweaks 8a34583fa overload to take schemaPaths as filesystem::path 8671b442f parse XML embedded in a binary file ec4a902f1 updates from xerces.lite 80dc4d963 updates from xerces.lite 549766d6c Attributes::contains() no longer catches an exception 8a645ceac need "sys/" when building in other environments 36af08269 super-simple URI validation 78ef28a3e SWIG bindings are a PITA! :-( e9cba8491 SWIG needs help with Uri 8a8d8dc07 another routines used by pre-build SWIG bindings 818e1ec5d pre-build SWIG bindings use getElementByTagName() member function 067cac5d8 old compiler gets confused on unadorned QName ba92c0ae7 more use of Uri and QName 446c7d17a use QName in new code d6f8b0c83 more direct use of QName 90fff1c73 use xml::lite::QName instead of tuple 646cbb5ed more direct use of QName and Uri ba589ea3b make QName more robust bab0ee8b5 createElement() -> addNewElement() e3a145747 grab changes from six-library 32285e95c Merge branch 'master' into feature/xml.lite_tweaks 9f79f0bf6 Merge branch 'master' into feature/xml.lite_tweaks a12bbc32c make it easier to create new Elements with a value fc9967f98 make it easy for callers to addChild() keep a reference to the Element 4627766b7 be sure test_xmlparser works in "externals" of other projects bf2276396 "private" is part of the name-mangling fad92bcc8 making sure copy-ctor is implemented f90fdcead consolidate common XML test code 9fc53f2d5 use str:: utility for casting 6da6f794b still trying to find the right macro for SWIG 0c1b86c56 still trying to fix SWIG fdc6fc9bd trying to fix SWIG build error 7835e8c27 SWIG needs copy-ctor 585695942 disable copy/assignment for Element, it's probably almost always wrong 391fed613 fix double-delete caused by copying 61790fe69 retry parsing XML with Windows-1252 if first parse() fails 63cffac59 change string_encoding to match coda-oss style of PascalCase 010479bbe read an XML file we know is wrongly encoded as Windows-1252 9a0505062 more references instead of pointers 2d44b6951 Reading Windows-1252 w/o "encoding" fails 63dc7b076 read Windows-1252 too c9434c9cb test as UIT-8 too f310ccf0c get reading from UTF-8 XML working on Windows 1fa39c2be get testReadUtf8XmlFile working on Linux 1a83cd815 sys::Path is too much trouble right now ed60aa22c unit-test to read XML from a file a9336db7c Squashed commit of the following: 0825beb0d Merge branch 'master' into feature/xml.lite_tweaks c618489be Merge branch 'master' into feature/xml.lite_tweaks e8e4b8fe1 determine string_encoding based on platform 1f43bcfc2 create a new Element by using the platform to determine "characterData" encoding 961bef66b Merge branch 'master' into feature/xml.lite_tweaks e9798a5cb fix static_assert() 6f7772874 Merge branch 'master' into feature/xml.lite_tweaks b98d4f5a9 Merge branch 'master' into feature/xml.lite_tweaks 1b5abba2a The (old) version of SWIG we're using doesn't like certain C++11 features. 53bdeabaf Merge branch 'master' into feature/xml.lite_tweaks 60cf8ae80 "" doesn't work with decltype() in older C++ 97e72477a reduce getValue() overloads by making "key" a template argument 5e6373e55 reduce code duplication f9e7cfeee provide castValue instead of getValue(T&) cbd0bd8f2 castValue throws instead of returning a bool like getValue(T&) 87c7514fc Merge branch 'master' into feature/xml.lite_tweaks 10cc61223 make getElement*() consistent for zero or >1 results f5b137e3c Merge branch 'master' into feature/xml.lite_tweaks 1765efc62 allow clients to specify toType() and toString() for getValue() and setValue() df8b746e1 allow clients to specify their own toType/toString routines 66702726a Merge branch 'master' into feature/xml.lite_tweaks 6956311f1 Merge branch 'master' into feature/xml.lite_tweaks d505f3593 Merge branch 'master' into feature/xml.lite_tweaks fbd106115 catch a BadCastException and return false from getValue() 3a78377b5 use a template to reduce duplicated code 0ad4b8606 Merge branch 'master' into feature/xml.lite_tweaks a848aa3a2 get & set the characer data as a type f3ee1ee12 utility routines to set an attribute value 595227683 templates to get an attribute value convert to a specific type 06639227b miised a change in last commit 1aa458ef8 add getValue() overloads that return true/false rather than throwing faa6d3075 added getElementByTagName() overloads as that's a very common use-case git-subtree-dir: externals/coda-oss git-subtree-split: f4d42005fa477ae59da193422aa2cb14b877cf0c commit ec161c5b334ea8133777a78ce94181807e591642 Merge: d2d594b9f 272cae451 Author: Dan Smith Date: Tue Jun 13 17:51:29 2023 -0400 Merge commit '272cae451cbe3ad6820d1221aafe375d77b1ba04' into develop/sync_externals commit d2d594b9ff50bc00c15a4228927ea1ec0449381b Author: Dan Smith Date: Tue Jun 13 17:51:25 2023 -0400 latest from CODA-OSS and NITRO commit 09ec30cc503ffd74daa401514ab9b674c6e4a3cf Merge: 28a4b2bd1 4a21b2db5 Author: Dan Smith Date: Thu Jun 15 15:54:31 2023 -0400 Merge branch 'main' into develop/complex_short commit 28a4b2bd17daabbb9ba94aae53a58986acd58a9b Author: Dan Smith Date: Thu Jun 15 14:58:55 2023 -0400 restore "old" CODA-OSS to minimize differences commit f41c086967d2e5b05ee8988272ab8ca8c0014f85 Author: Dan Smith Date: Thu Jun 15 14:40:31 2023 -0400 keep using std::complex<> everywhere commit bc1704c8cb985f1987a7d3ff2b37c2e48286a8fd Author: Dan Smith Date: Thu Jun 15 14:22:47 2023 -0400 latest from CODA-OSS commit 4ec782e6c9409f1985628c36a88577b286af61e7 Author: Dan Smith Date: Thu Jun 15 13:56:24 2023 -0400 build against "old" CODA-OSS commit bffd6a985d8dc8e08b42aed78bbe7a162ac45bf6 Author: Dan Smith Date: Thu Jun 15 13:56:08 2023 -0400 restore CODA-OSS changes to minimize merge differences commit d93e0e80c94013e1b957eb2c33ba112643c306c3 Author: Dan Smith Date: Thu Jun 15 13:39:37 2023 -0400 more passing the entire complex type as a template parameter commit 0872159268ff8f38e3c3d42788598725ce142616 Author: Dan Smith Date: Thu Jun 15 13:25:14 2023 -0400 no more types::complex commit 379a89312f55c86f1de95f6ff14e7aeca72df32c Author: Dan Smith Date: Thu Jun 15 12:36:06 2023 -0400 use CODA_OSS_types_unique_zinteger commit 2b9b396c4d460233418f293d6ebdf157231b8757 Author: Dan Smith Date: Thu Jun 15 11:58:00 2023 -0400 latest from CODA-OSS commit 5d19ea2946556ab9f7e2e1ec98e0d07fecf578e2 Merge: 0dab1a156 7e99024da Author: Dan Smith Date: Thu Jun 15 11:07:26 2023 -0400 Merge branch 'develop/complex' into develop/complex_short commit 7e99024da866660e7e4da621b75f4561e638044b Author: Dan Smith Date: Thu Jun 15 11:06:20 2023 -0400 unittest changes from develop/complex_short branch commit e5c0f6d52e05bf50741a6bc086eae9ce53a89e9e Author: Dan Smith Date: Thu Jun 15 11:00:34 2023 -0400 more changes from CODA-OSS commit ca7cb60f6b39a2f1a03dd1497bb20a4da5925c24 Author: Dan Smith Date: Thu Jun 15 10:34:57 2023 -0400 no more types::complex commit 6048da55638d0283cf789347740871aa2d07fba1 Author: Dan Smith Date: Thu Jun 15 10:18:44 2023 -0400 latest from CODA-OSS commit 16c99ed82bb9b57edc1ea5e28d68f89b63519664 Author: Dan Smith Date: Thu Jun 15 08:13:27 2023 -0400 pass the entire complex type and use value_type commit 4d9d2a764319f3177b427b3a03ae95c99ef02494 Author: Dan Smith Date: Thu Jun 15 09:24:49 2023 -0400 pass entire complex type as template parameter commit 0dab1a15681e51a5464b363baa0f263e25521c4a Author: Dan Smith Date: Thu Jun 15 09:24:49 2023 -0400 pass entire complex type as template parameter commit e4c29f670785b3312dda1d6b6da30847fa798b89 Author: Dan Smith Date: Thu Jun 15 09:14:37 2023 -0400 Update PVPBlock.cpp commit 7133f7f4b4752d0e049ef48241a4e1b707a5c4ec Author: Dan Smith Date: Thu Jun 15 09:09:11 2023 -0400 restore types::z* overloads commit 9a0c890090d5501bb2c563e0b36a787cfad70af6 Merge: a3a71ba35 fc8ba82bd Author: Dan Smith Date: Thu Jun 15 09:01:31 2023 -0400 Merge branch 'develop/complex' into develop/complex_short commit fc8ba82bd5357454d02276c1605ddcd5973322d1 Author: Dan Smith Date: Thu Jun 15 08:59:58 2023 -0400 findComplex() utility commit 8b762374c282458c469ad6e4502aaee7aa695079 Author: Dan Smith Date: Thu Jun 15 08:47:56 2023 -0400 const& for Parameter arguments commit a3a71ba351b9b790c20bb80e4fac861592758164 Author: Dan Smith Date: Thu Jun 15 08:26:00 2023 -0400 getComplex() overloads commit 6fc1ee4b96b722b81042f79ed476c481af13aadd Author: Dan Smith Date: Thu Jun 15 08:13:27 2023 -0400 pass the entire complex type and use value_type commit 13e44351a9e912c91fd79ada8b09a544c482874a Author: J. Daniel Smith Date: Wed Jun 14 21:47:37 2023 -0400 more progress on types::complex commit 5e72ecca7037861e87f311339c61bc2cf77305fe Author: Dan Smith Date: Wed Jun 14 17:43:52 2023 -0400 use our own type for complex commit 9bfc4f9799df5261bbc0c7afb1ffa08abc060ba1 Author: Dan Smith Date: Wed Jun 14 17:42:58 2023 -0400 latest from CODA-OSS commit 39153f274d56de88a28b526978dd4ad832e767f9 Author: Dan Smith Date: Wed Jun 14 16:45:05 2023 -0400 fix Parameter::setValue() overloads commit b8007fbad15e529eb503bbfd692c85ce6d34a0a6 Author: Dan Smith Date: Wed Jun 14 16:37:10 2023 -0400 latest from coda-oss commit 27f080ec628c4497709cfc85183f3a1ceaad11cb Author: Dan Smith Date: Wed Jun 14 16:22:29 2023 -0400 move is implicitly deleted because of =delete for copy commit bd69591ff8c93d1aaa9f184346eac2aca83b3272 Merge: 71d519492 35b59b9a0 Author: Dan Smith Date: Wed Jun 14 16:09:16 2023 -0400 Merge branch 'main' into develop/complex_short commit 71d519492046c4c61986f181f6ec7aa18cb4c0c6 Author: Dan Smith Date: Tue Jun 13 15:25:54 2023 -0400 std::complex -> six::zfloat commit a3eee8257746732f61b959c9b31442511d81b590 Merge: d0bb8c181 e13c3da4f Author: Dan Smith Date: Tue Jun 13 15:17:07 2023 -0400 Merge branch 'main' into develop/complex_short commit d0bb8c1819da2ade60c4ce3349ff40f32fe31301 Author: Dan Smith Date: Tue Jun 13 15:15:46 2023 -0400 finish (almost) switching to types::complex for integers commit bbe1320e33768a0a0f151feb138643c80a8bdfbd Author: Dan Smith Date: Tue Jun 13 14:57:21 2023 -0400 types::complex is std::complex for now commit 00047f57ea462c610d249d25fcd2f0105a7c0f41 Author: Dan Smith Date: Tue Jun 13 14:36:27 2023 -0400 latest from coda-oss commit ac376dcf72763892e9e9b9c03fb14bc34fd04630 Author: Dan Smith Date: Tue Jun 13 14:13:42 2023 -0400 Update test_dump_images.cpp commit 2907efbcfdb33f154138944831a94a2c508b5a68 Author: Dan Smith Date: Mon Jun 12 16:39:29 2023 -0400 use types::complex for TInteger commit 2580312337bf1b7ee20d5ba9eed83c8e65e06e6f Author: Dan Smith Date: Mon Jun 12 16:26:16 2023 -0400 CPHD aliaes for std::complex commit d177963c782c08c137d14b9608207d40754db568 Author: Dan Smith Date: Mon Jun 12 16:17:38 2023 -0400 latest from coda-oss commit e05937c9b568f52fa9f41b279e2c8ecfa63e5fc0 Author: Dan Smith Date: Mon Jun 12 15:41:34 2023 -0400 use types::z* aliases for complex commit 2b61dcc4974b7326db762f6f6fd60dc263bb87e6 Author: Dan Smith Date: Mon Jun 12 15:05:41 2023 -0400 begin switching to types::complex for integral T commit b4e625673c3d270896eed26b4c83bc827befc538 Author: Dan Smith Date: Mon Jun 12 14:59:30 2023 -0400 turn off _SILENCE_NONFLOATING_COMPLEX_DEPRECATION_WARNING commit 9bd683bc8858d07378c390c3cd4fcaed4a490a21 Author: Dan Smith Date: Mon Jun 12 14:54:22 2023 -0400 std::complex -> zfloat commit 47aa0e8994af5b31602f63adaac3b3415cb769c2 Author: Dan Smith Date: Mon Jun 12 14:45:00 2023 -0400 std::complex -> zfloat commit 3785ed2c8e0f812ae43e1e81971bce6777eb91a1 Author: Dan Smith Date: Mon Jun 12 14:38:18 2023 -0400 aliases for std::complex and std::complex commit d5db375ba08737551023d9b21455f3d5cd71faf0 Author: Dan Smith Date: Mon Jun 12 14:20:01 2023 -0400 Squashed commit of the following: commit bb2bb5aaf944040ea5bc42168b846324287dcad8 Merge: bbba5a210 4c146e7d0 Author: Dan Smith Date: Mon Jun 12 13:04:09 2023 -0400 Merge commit '4c146e7d01b14cf408b0e398cba96705df69090c' into develop/sync_externals commit 4c146e7d01b14cf408b0e398cba96705df69090c Author: Dan Smith Date: Mon Jun 12 13:04:09 2023 -0400 Squashed 'externals/coda-oss/' changes from aeec0131c..c88b9c053 c88b9c053 types::complex (#681) d1244a080 don't need our own make_unique in C++14 (#680) git-subtree-dir: externals/coda-oss git-subtree-split: c88b9c05325c802f88a85ddcebb498be4afacad0 commit bbba5a210c0257f622781914e9d228eeca23341c Author: Dan Smith Date: Mon Jun 12 13:04:06 2023 -0400 latest from CODA-OSS commit 370dd8876136755230624ebc955bc67642b1482b Merge: 58ff5a537 ffe1caafd Author: Dan Smith Date: Mon Jun 12 13:03:25 2023 -0400 Merge branch 'main' into develop/sync_externals commit 58ff5a5371d9158910e99613f4ce6e6fc36e543e Author: Dan Smith Date: Thu Jun 8 16:23:08 2023 -0400 latest from CODA-OSS commit 3bfc33a40274fa7a073983d4e4ddd907e45730d2 Author: Dan Smith Date: Thu Jun 8 14:34:45 2023 -0400 latest from CODA-OSS and NITRO commit 389417a983778ba2a07af9c6dbfea80484324b97 Merge: bce7ba0b1 4ad490fe4 Author: Dan Smith Date: Thu Jun 8 14:34:28 2023 -0400 latest from CODA-OSS and NITRO commit 4ad490fe4224df18ce4a437c40a257af0686140e Author: Dan Smith Date: Thu Jun 8 14:34:22 2023 -0400 Squashed 'externals/nitro/' changes from c8ecbe9ae..05dae18a3 05dae18a3 patch to build other projects 8f974e995 NITRO-2.11.3 (#554) 870aa6afd update to coda-oss 2023-06-05 (#553) 2fd7a0bfa latest from coda-oss (#552) 0eecce004 invoke() utility to reduce code duplication (#550) 59fb02fe9 latest from coda-oss (#551) 9fbf2b7b8 Fill out adapter free block which is used for nitf decompression (#549) 089ba0b5b latest from coda-oss 3b52f0025 latest from coda-oss (#547) 90c6263e2 latest from coda-oss (#544) 90d513ac5 latest from coda-oss (#543) git-subtree-dir: externals/nitro git-subtree-split: 05dae18a3a9c5ad70e1ce814c21ca8ec278829be commit 86929db19a438630d531ca0c34bdcd8e8c527ae9 Author: Dan Smith Date: Thu Jun 8 14:34:18 2023 -0400 Squashed 'externals/coda-oss/' changes from e87c32b4d..aeec0131c aeec0131c assert()s for mem::CopyablePtr (#679) 72b0ebd60 add types::complex_short (#678) 932130a58 patch to build other projects c00c1f203 coda-oss release 2023-06-06 (#677) ef54bbcd5 remove more compiler warnings (#676) dadfc5ce6 distinguish between byte-swapping a buffer and single value (#674) 90187f6cd more xml.lite tweaks for SIDD-3.0/ISM (#675) eb9960772 stronger type-checking for byteSwap() (#673) ff4f820ed xml.lite tweaks to support SIDD 3.0 ISM (#672) b1de8c0e5 std::byte should be a unique type (#671) c05bf9a02 allow enums to be byte-swapped too 1f9fd88d6 remove spurious 47684c45b byteSwap now uses byte buffers (#670) cbc659db2 add swapBytes() utility from SIX (#669) 891481b64 simplify byte-swapping (#668) 540ae763e more byteSwap() tweaks 0774c03c4 threaded byteSwap() (#667) d156370d3 swapping a single-byte value makes no sense c120e3255 be sure parameter is used to avoid compiler warning e85ec9331 --output-on-failure for CTest (#666) e80376197 turn off "there is no warning number" warning c5f0a5d15 A C-string may not be NULL-terminated (#665) 0c5eb29ae use platform-specific routines for byteSwap() (#664) 0b7d581fa remove transform_async() (#663) f6489b6be Merge branch 'main' into feature/xml.lite_tweaks 836c426a2 use function-pointers so that isConsoleOutput is only checked once 56e3c45b1 move depthPrint() functionality into non-member function in preparation for future changes ddcd26d97 Merge branch 'main' into feature/xml.lite_tweaks 69cc0e506 use the more rigorous create_and_check_datatype() 9efb87558 Merge branch 'main' into feature/hdf5 4d2f2f417 more HighFive unittests (#662) 14191a844 HighFive::create_datatype() goes from C++ to HighFive 98583473f utility routines to read string attributes 1fa75ce81 use the C API to read a string attribute 71e7b69f5 still can't figure out how to read a string attribute :-( e96f37a69 test reading the file attributes a25244519 getAttribute() unittest 8f12a3000 getDataType() unittest 857ff0af3 HighFive utility routines (#661) 1d687db57 writeDataSet() utility overload 106aa6894 sigh ... H5Easy::dump() fill fails on Windows/WAF :-( 2641b60b2 Merge branch 'main' into feature/hdf5 35c19e7e8 change actions to @v3 (#660) 212bbd3a3 works on local machine, but not build server ... ? 7125118b0 dump of 1D vector doesn't work :-( c704db435 sigh ... WAF build still failing :-( 01aae4616 does dump() of a 1D vector work? 76a53c813 comment-out H5 writing :-( 0f0e19aff test_highfive_dump() cb8f73795 trying to get highfive_dump() unittest working w/Windows-WAF 6584a264a does test_highfive_create() work? cde6147ce tweak HighFive wrappers (#659) 316566854 Revert "trying HighFive "write" unittests again" a9ec24ca4 trying HighFive "write" unittests again 585ad49a5 tweak names of utility routines 4c91a4d97 make it easier to read a std::vector and std::vecotr 0217ffa26 readDataSet() now works for 1D data 95e8973f2 trying to get hdf5::lite::load() working 4d294611d "const" correctness 5e6305c3f fix load_complex() 4a134dc5f start work on utility routines to read complex data from HDF5 9d76a7f41 Merge branch 'main' into feature/hdf5 8f9667a24 whitepsace ebd3fc99e Merge branch 'main' into feature/hdf5 40091b069 comment-out writing tests for now ... need to figure our WAF bulid failure 935aa3459 be sure the dataset has real data 114b9bf33 update release notes bd9c0b26c tweak HighFive utility routines acda1ef57 turn off diagnostics around expected failures 22a748840 readDataSet() utility routine for HighFive bd88a8c25 HighFive writeDataSet() utility to work with our SpanRC 6142f5b33 use HighFive routines to write a HDF5 file 5bbf1abaf Use HiveFive routines to get info about the file 84fbc8378 duplicate unittests with H5Easy f1f054c03 Merge branch 'main' into feature/hdf5 9b63ca470 fix directory names f6f826689 fix directory names 7aeb82c33 Merge branch 'main' into feature/hdf5 d028baaeb hook up HighFive header-only library (#653) 3083b0a31 Revert "HighFive 2.6.2" 246985a7f Revert ""build" HighFive HDF5 library" a8b75a586 Revert "turn off HighFive Boost support" ec68d5f83 Revert "Add HighFive unittests" f1f85b9e7 Revert "get test_high_five_base more-or-less compiling" 5ea634ee1 Revert "more work on getting HighFive unittests to build" ecc45433c more work on getting HighFive unittests to build bb194788a get test_high_five_base more-or-less compiling d42bde000 Add HighFive unittests ddc86bb32 turn off HighFive Boost support b255122d4 "build" HighFive HDF5 library 396cc3ef2 HighFive 2.6.2 5e5f9d9c0 Merge branch 'main' into feature/hdf5 ee938b4a5 changes from SIX bb764df90 Merge branch 'main' into feature/xml.lite_tweaks de2a24380 make derived classes 'final' if possible 14e19bcd2 Change xml lite function to virtual (#645) 8f42ac8e9 Merge branch 'main' into feature/xml.lite_tweaks 18ad90645 hdf5Write unittest 3462e1179 createFile() and writeFile() overloads ecee81d53 fix typos 197eecfa6 sketch-out hdf5::lite::writeFile() bd2311795 use SpanRC for writeFile(), not yet implemented ea9af7510 simple SpanRC to hold a 2D-size and pointer 027c19ee8 createFile() unittest 1f9d07ecb hook up createFile() 8c7e4473f start hooking up HDF5 writing 146e0bea3 Merge branch 'main' into feature/hdf5 88ca9fcb7 Merge branch 'main' into feature/hdf5 42b604b46 Squashed commit of the following: 10ee602c2 Merge branch 'main' into feature/hdf5 67aa42b69 restore changes from "main" 8bbfcbfbf unittests can be simplified to match fewer "view" classes 126bb802e Merge branch 'main' into feature/hdf5 3f8ba7a42 again, don't need a class just to convert from std::vector<> to std::span<> 24c2b489c Squashed commit of the following: 2703c119d Squashed commit of the following: 9d5228a2b don't need an entire class just to convert a std::vector<> into std::span<> 51bc931dc Merge branch 'main' into feature/hdf5 a84f25816 Squashed commit of the following: c4d2ed696 add missing #include guards, fix type in existing #include guard d541525a0 use a single ComplexViewConstIterator for all views 86e6a459f CODA_OSS_disable_warning causes GCC errors :-( 5d4b9c2cb only need an custom iterator for ComplexSpansView d9f0fb128 hook up iterators b9329e4db initial pass at a ComplexViewConstIterator 635238873 remove compiler warning about unused "constexpr" variables b39f6096f use the casing from H5 to make copy/pasting code slightly easier 0887b13eb Merge branch 'main' into feature/hdf5 bd07df1ca Consistent casing for Dataset, Datatype, Dataspace 7acd30ee2 tweak hdf5.lite dependencies 38ab914df Jupyter notebook for creating H5 files 95a040e0b _small.h5 is now (correctly) FLOAT32 107e7c487 make a simple values() member function to avoid template magic e1feca919 use TEST_SPECIFIC_EXCEPTION macro instead of try/catch 738333688 readDatasetT() now throws for the wrong buffer type 6b2cc2529 Merge branch 'feature/hdf5' of github.com:mdaus/coda-oss into feature/hdf5 310f8fd3d can't get template magic right for copy_axis() 86b306d59 stepping through copy ctors in the debugger is annoying f243e92d6 trying to make wrong type of buffer fail 2b10d9652 read in new sample file a28e59d8c help the compiler with type deduction 49bf5e9bc nested_complex_float_data_small.h5 e029325fc utility routines to "deconstruct" and array of std::complex dede3bd39 Merge branch 'main' into feature/hdf5 904b1ef5e tweak class names, make_() and copy() utility routines 8237b9efb make it harder to pass the wrong types to ComplexViews 4d9aeda2c ComplexArrayView and ComplexParallelView utility classes f5e367dfa test std::span> a4a2844f2 read in the nested "i" and "r" data 115615265 sample file has subgroups 8e1b7869a Merge branch 'feature/hdf5' of github.com:mdaus/coda-oss into feature/hdf5 9f4232a1d update sample H5 file 8c55db73a walk through HDF5 sub-groups 7775ed9c4 Update 123_barfoo_catdog_cx.h5 677975d7c Matlab code to create sample H5 file a0e7dfe07 Update test_hdf5info.cpp 0b67e1602 pass __FILE__ and __LINE__ from calling site for a more accurate exception message 86a677321 skeleton for more sample data 85f79b099 Merge branch 'main' into feature/hdf5 18088e942 Merge branch 'main' into feature/hdf5 3a1d17692 Merge branch 'main' into feature/hdf5 1755c69d7 Merge branch 'main' into feature/hdf5 9ad015432 No more "11" suffix on exception names c20d96251 Squashed commit of the following: c88cee999 other values to be filled-in bca4a4ecd incorporation NamedObject from HDF5 docs 61fa68f72 groupInfo() 460e7d766 datasetInfo() 14eb9b764 start filling in DatasetInfo afe5f1c3a start to fill in DatasetInfo 77a968c72 start filling in GroupInfo d81bcdfd9 openGroup() to open groups (loc) a0cd29469 comment-out "dataset" unittest for now 86e006024 begin filling in FileInfo 366dda6ab a return_type_of utility is needed to deduce the return type e21928263 explicitly pass return type to template 4937ccd11 template to reduce boilerplate when calling try_catch_H5Exceptions b3b5ebde7 use new exception utility routines ea1c03ef0 put exception handling/conversion in a utility routine 819a99d39 utility routine for exception handling 6f34eea97 put utilities in a separate file for easier reuse fcbde4f24 break utility routines into smaller pieces for easier reuse 52358ea8a WIN32 no longer automatically defined? 5a4286472 Revert "build HDF5 with C89" 680e599e9 build HDF5 with C89 a87a07121 Merge branch 'main' into feature/hdf5 8447c1a90 Revert "sym-links instead of copying files" db3b5e12b Merge branch 'main' into feature/xml.lite_tweaks fb60b5696 Merge branch 'main' into feature/hdf5 5110a5cc8 Comments about _u and _q 1a937d32c Merge branch 'main' into feature/xml.lite_tweaks fa06f04d7 get ready for hdf5.lite enhancdements b040c7c43 sym-links instead of copying files aa431bb47 use _u for xml::lite::Uri 3d0c6d58c fix case-sensitive #include filename 93dcd0e52 operator() for getElementByName() 75a93af85 more operator[] overloads to make attribute management easier 4ab8216f8 user-defined string literals to remove some noise around xml::lite::QName f82f0b0fc Merge branch 'main' into feature/xml.lite_tweaks ae30e3644 Merge branch 'feature/xml.lite_tweaks' of github.com:mdaus/coda-oss into feature/xml.lite_tweaks ffdd9beb0 simplify attribute creation 9bf5414f5 simplify attribute creation 82d7a4e95 SWIG gets confused about namespaces 7a61d0741 fix bug on Element ctor uncovered by unittest fdd7e58c1 QName is also in the xerces namespace which confuses SWIG bindings a325b7053 operator+=() overload for addChild daf30e6c0 Merge branch 'feature/xml.lite_tweaks' of github.com:mdaus/coda-oss into feature/xml.lite_tweaks b887d2b47 provide overloads for Element& rather than creating new "reference" types 1fa6bba38 rename test_xmleasy.cpp 7c8c9e0f1 += overload 850da6f63 overload for std::string 4547fc5a7 use UIT-8 strings for characterData 4723462a3 convenient addChild() overloads e48720753 copy over ElementReference from xml.easy a4ca30a0d Merge branch 'main' into feature/xml.lite_tweaks 6ae9f0b71 Revert "check-in of new xml.easy (to move code between computers)" f7466a6d7 Revert "simple routines for single element" a5490230d Revert "make some operators simplier ways of calling functions" c9a25630a Revert "get document creation working" 8af8710b0 Revert "free functions instead of member functions" 16c3847cb Revert "ElementReference distinct from Element" 7d68e156f Revert "ElementMutableReference" 00eb2a282 Merge branch 'main' into feature/xml.lite_tweaks a42969c1f ElementMutableReference a20ae9355 ElementReference distinct from Element 14eeeea0b free functions instead of member functions 4aae014b3 get document creation working 883569269 make some operators simplier ways of calling functions 053bd1212 simple routines for single element 8bf701a2e check-in of new xml.easy (to move code between computers) 41f959051 unittests for creating XML documents from scratch 9752d50ae Merge branch 'main' into feature/xml.lite_tweaks 1531d5709 by default, don't validate strings passed to Uri() 46d13d4bf Merge branch 'master' into feature/xml.lite_tweaks 39b547d32 remove more vestiges of Expat and LibXML ec8274d52 remove LibXML and Expat as they're no longer used/supported. 20eeefeef Merge branch 'master' into feature/xml.lite_tweaks 95074b9b1 update for newer Intel compiler 7024f71e1 Merge branch 'master' into feature/xml.lite_tweaks 57b1cbc83 Merge branch 'master' into feature/xml.lite_tweaks 4b67561c3 remove validate() overload that nobody is using fa15f1e5d Squashed commit of the following: 1484a9090 test the new validate() API 470da70fb hookup StringStreamT routines 2cddf2504 begin hooking up validate() overloads 1b5d910f3 overload validate() for UTF-8 and Windows-1252 03309b8c9 Squashed commit of the following: b72c6c5bf older compiler doesn't like our make_unique af8f00307 validate UTF-8 XML on Linux 211188613 unit-test for LEGACY XML validation 3c1169d2b Squashed commit of the following: 3afff19ca std::filesystem::path for FileInputStreamOS 908d452f8 WIP: validate all of our sample XML files 00f9bb16b validate against a XML schema 243d8c356 Merge branch 'master' into feature/xml.lite_tweaks 2815d707d fix to work with SWIG bindings. :-( 460862132 trying (again) to remove vestiages of old code e3c83a858 Revert "new code should use UTF-8" 811207c92 new code should use UTF-8 0ffd835f9 Squashed commit of the following: 1e7e03ded Merge branch 'master' into feature/xml.lite_tweaks c1d806aff Merge branch 'master' into feature/xml.lite_tweaks 850d3c811 str::strip() that can be easier to use than str::trim() 580ba9c8c explicitly =delete move 2b39831a8 Squashed commit of the following: 39eebdc23 Merge branch 'master' into feature/xml.lite_tweaks 9adf86cba force calling new UTF-8 write() routines ea61b6204 Merge branch 'master' into feature/xml.lite_tweaks 8a34583fa overload to take schemaPaths as filesystem::path 8671b442f parse XML embedded in a binary file ec4a902f1 updates from xerces.lite 80dc4d963 updates from xerces.lite 549766d6c Attributes::contains() no longer catches an exception 8a645ceac need "sys/" when building in other environments 36af08269 super-simple URI validation 78ef28a3e SWIG bindings are a PITA! :-( e9cba8491 SWIG needs help with Uri 8a8d8dc07 another routines used by pre-build SWIG bindings 818e1ec5d pre-build SWIG bindings use getElementByTagName() member function 067cac5d8 old compiler gets confused on unadorned QName ba92c0ae7 more use of Uri and QName 446c7d17a use QName in new code d6f8b0c83 more direct use of QName 90fff1c73 use xml::lite::QName instead of tuple 646cbb5ed more direct use of QName and Uri ba589ea3b make QName more robust bab0ee8b5 createElement() -> addNewElement() e3a145747 grab changes from six-library 32285e95c Merge branch 'master' into feature/xml.lite_tweaks 9f79f0bf6 Merge branch 'master' into feature/xml.lite_tweaks a12bbc32c make it easier to create new Elements with a value fc9967f98 make it easy for callers to addChild() keep a reference to the Element 4627766b7 be sure test_xmlparser works in "externals" of other projects bf2276396 "private" is part of the name-mangling fad92bcc8 making sure copy-ctor is implemented f90fdcead consolidate common XML test code 9fc53f2d5 use str:: utility for casting 6da6f794b still trying to find the right macro for SWIG 0c1b86c56 still trying to fix SWIG fdc6fc9bd trying to fix SWIG build error 7835e8c27 SWIG needs copy-ctor 585695942 disable copy/assignment for Element, it's probably almost always wrong 391fed613 fix double-delete caused by copying 61790fe69 retry parsing XML with Windows-1252 if first parse() fails 63cffac59 change string_encoding to match coda-oss style of PascalCase 010479bbe read an XML file we know is wrongly encoded as Windows-1252 9a0505062 more references instead of pointers 2d44b6951 Reading Windows-1252 w/o "encoding" fails 63dc7b076 read Windows-1252 too c9434c9cb test as UIT-8 too f310ccf0c get reading from UTF-8 XML working on Windows 1fa39c2be get testReadUtf8XmlFile working on Linux 1a83cd815 sys::Path is too much trouble right now ed60aa22c unit-test to read XML from a file a9336db7c Squashed commit of the following: 0825beb0d Merge branch 'master' into feature/xml.lite_tweaks c618489be Merge branch 'master' into feature/xml.lite_tweaks e8e4b8fe1 determine string_encoding based on platform 1f43bcfc2 create a new Element by using the platform to determine "characterData" encoding 961bef66b Merge branch 'master' into feature/xml.lite_tweaks e9798a5cb fix static_assert() 6f7772874 Merge branch 'master' into feature/xml.lite_tweaks b98d4f5a9 Merge branch 'master' into feature/xml.lite_tweaks 1b5abba2a The (old) version of SWIG we're using doesn't like certain C++11 features. 53bdeabaf Merge branch 'master' into feature/xml.lite_tweaks 60cf8ae80 "" doesn't work with decltype() in older C++ 97e72477a reduce getValue() overloads by making "key" a template argument 5e6373e55 reduce code duplication f9e7cfeee provide castValue instead of getValue(T&) cbd0bd8f2 castValue throws instead of returning a bool like getValue(T&) 87c7514fc Merge branch 'master' into feature/xml.lite_tweaks 10cc61223 make getElement*() consistent for zero or >1 results f5b137e3c Merge branch 'master' into feature/xml.lite_tweaks 1765efc62 allow clients to specify toType() and toString() for getValue() and setValue() df8b746e1 allow clients to specify their own toType/toString routines 66702726a Merge branch 'master' into feature/xml.lite_tweaks 6956311f1 Merge branch 'master' into feature/xml.lite_tweaks d505f3593 Merge branch 'master' into feature/xml.lite_tweaks fbd106115 catch a BadCastException and return false from getValue() 3a78377b5 use a template to reduce duplicated code 0ad4b8606 Merge branch 'master' into feature/xml.lite_tweaks a848aa3a2 get & set the characer data as a type f3ee1ee12 utility routines to set an attribute value 595227683 templates to get an attribute value convert to a specific type 06639227b miised a change in last commit 1aa458ef8 add getValue() overloads that return true/false rather than throwing faa6d3075 added getElementByTagName() overloads as that's a very common use-case git-subtree-dir: externals/coda-oss git-subtree-split: aeec0131c51497c5d448a39be0d2df608d93bc15 commit bce7ba0b1ae40e9ddcb4f24610e7e4d702272d54 Merge: 646b70e8d 86929db19 Author: Dan Smith Date: Thu Jun 8 14:34:18 2023 -0400 Merge commit '86929db19a438630d531ca0c34bdcd8e8c527ae9' into develop/sync_externals commit 646b70e8d47438211451493837e6b2d76db4e896 Author: Dan Smith Date: Thu Jun 8 14:34:13 2023 -0400 latest from CODA-OSS and NITRO * use parallel version of std::transform with C++17 * nearest_neighbors() so that the loop is closer to the actual code * Squashed commit of the following: commit c747f326b60ba8a82b3c33e91aabe2651d6bb13d Author: Dan Smith Date: Mon Jun 19 14:30:50 2023 -0400 latest from CODA-OSS and NITRO commit b142ec4fcb2a8007e35e3d68e0ae752f4b2828d0 Merge: 2829f93c9 3d4e554aa Author: Dan Smith Date: Mon Jun 19 14:30:15 2023 -0400 sync_externals commit 3d4e554aa3934c7157bf9c2e57e2482662938b10 Author: Dan Smith Date: Mon Jun 19 14:30:07 2023 -0400 Squashed 'externals/nitro/' changes from 3f01809fa..cee9feb42 cee9feb42 latest from CODA-OSS (#558) git-subtree-dir: externals/nitro git-subtree-split: cee9feb424b0f9c1f11f37f67a1795b3cc5e8dd1 commit 2829f93c9de0e8787dbe6cb319d6f32143dcdd8e Merge: e47ccf30e 12995e63a Author: Dan Smith Date: Mon Jun 19 14:29:10 2023 -0400 Merge branch 'main' into develop/sync_externals commit e47ccf30e059e0cd32b42dc90a45f4b8a8512caf Author: Dan Smith Date: Mon Jun 19 14:19:10 2023 -0400 latest from CODA-OSS commit 04090c4a13b921f33257662950e46bfc2e58cabb Merge: cc6009422 ac1ccde84 Author: Dan Smith Date: Mon Jun 19 14:18:41 2023 -0400 sync_externals commit ac1ccde84b2be856ac947b2670dd8228c9980889 Author: Dan Smith Date: Mon Jun 19 14:18:34 2023 -0400 Squashed 'externals/nitro/' changes from c8ecbe9ae..3f01809fa 3f01809fa latest from coda-oss (#557) 471fb3fc1 Update test_j2k_loading++.cpp b12caf2fc latest from CODA-OSS (#556) 0cd432624 use sys::make_span (#555) 05dae18a3 patch to build other projects 8f974e995 NITRO-2.11.3 (#554) 870aa6afd update to coda-oss 2023-06-05 (#553) 2fd7a0bfa latest from coda-oss (#552) 0eecce004 invoke() utility to reduce code duplication (#550) 59fb02fe9 latest from coda-oss (#551) 9fbf2b7b8 Fill out adapter free block which is used for nitf decompression (#549) 089ba0b5b latest from coda-oss 3b52f0025 latest from coda-oss (#547) 90c6263e2 latest from coda-oss (#544) 90d513ac5 latest from coda-oss (#543) git-subtree-dir: externals/nitro git-subtree-split: 3f01809fae7d471aa0f1594fc5eec1e3111cd710 commit cc6009422ec41dd6e48ade90c37bdbfd97a1bc35 Merge: fec3755e0 1ceb8e3ff Author: Dan Smith Date: Mon Jun 19 14:18:30 2023 -0400 Merge commit '1ceb8e3ffb55a240085250cfde3f4d1ab7ef0b04' into develop/sync_externals commit 1ceb8e3ffb55a240085250cfde3f4d1ab7ef0b04 Author: Dan Smith Date: Mon Jun 19 14:18:30 2023 -0400 Squashed 'externals/coda-oss/' changes from e87c32b4d..54033e70e 54033e70e Merge branch 'main' into feature/complex_short 3c63f9f65 std::numbers from C++20 (#691) 892dd0e00 ComplexInteger and ComplexReal to better match existing naming conventions (#690) b3872181e match coda-oss naming conventions (#688) 704d6867f beef-up our complex type (#687) 47c1c1cd6 check is_absolute() for URLs (#686) c042373e1 be sure our Path::isAbolute() matches std::filesystem::path::absolute() (#684) ad10286bc volatile is about "special" memory, not threading (#685) f4d42005f fix build error in NITRO ff11a5557 keep using std::complex for now (#682) c88b9c053 types::complex (#681) d1244a080 don't need our own make_unique in C++14 (#680) aeec0131c assert()s for mem::CopyablePtr (#679) 72b0ebd60 add types::complex_short (#678) 932130a58 patch to build other projects c00c1f203 coda-oss release 2023-06-06 (#677) ef54bbcd5 remove more compiler warnings (#676) dadfc5ce6 distinguish between byte-swapping a buffer and single value (#674) 90187f6cd more xml.lite tweaks for SIDD-3.0/ISM (#675) eb9960772 stronger type-checking for byteSwap() (#673) ff4f820ed xml.lite tweaks to support SIDD 3.0 ISM (#672) b1de8c0e5 std::byte should be a unique type (#671) c05bf9a02 allow enums to be byte-swapped too 1f9fd88d6 remove spurious 47684c45b byteSwap now uses byte buffers (#670) cbc659db2 add swapBytes() utility from SIX (#669) 891481b64 simplify byte-swapping (#668) 540ae763e more byteSwap() tweaks 0774c03c4 threaded byteSwap() (#667) d156370d3 swapping a single-byte value makes no sense c120e3255 be sure parameter is used to avoid compiler warning e85ec9331 --output-on-failure for CTest (#666) e80376197 turn off "there is no warning number" warning c5f0a5d15 A C-string may not be NULL-terminated (#665) 0c5eb29ae use platform-specific routines for byteSwap() (#664) 0b7d581fa remove transform_async() (#663) f6489b6be Merge branch 'main' into feature/xml.lite_tweaks 836c426a2 use function-pointers so that isConsoleOutput is only checked once 56e3c45b1 move depthPrint() functionality into non-member function in preparation for future changes ddcd26d97 Merge branch 'main' into feature/xml.lite_tweaks 69cc0e506 use the more rigorous create_and_check_datatype() 9efb87558 Merge branch 'main' into feature/hdf5 4d2f2f417 more HighFive unittests (#662) 14191a844 HighFive::create_datatype() goes from C++ to HighFive 98583473f utility routines to read string attributes 1fa75ce81 use the C API to read a string attribute 71e7b69f5 still can't figure out how to read a string attribute :-( e96f37a69 test reading the file attributes a25244519 getAttribute() unittest 8f12a3000 getDataType() unittest 857ff0af3 HighFive utility routines (#661) 1d687db57 writeDataSet() utility overload 106aa6894 sigh ... H5Easy::dump() fill fails on Windows/WAF :-( 2641b60b2 Merge branch 'main' into feature/hdf5 35c19e7e8 change actions to @v3 (#660) 212bbd3a3 works on local machine, but not build server ... ? 7125118b0 dump of 1D vector doesn't work :-( c704db435 sigh ... WAF build still failing :-( 01aae4616 does dump() of a 1D vector work? 76a53c813 comment-out H5 writing :-( 0f0e19aff test_highfive_dump() cb8f73795 trying to get highfive_dump() unittest working w/Windows-WAF 6584a264a does test_highfive_create() work? cde6147ce tweak HighFive wrappers (#659) 316566854 Revert "trying HighFive "write" unittests again" a9ec24ca4 trying HighFive "write" unittests again 585ad49a5 tweak names of utility routines 4c91a4d97 make it easier to read a std::vector and std::vecotr 0217ffa26 readDataSet() now works for 1D data 95e8973f2 trying to get hdf5::lite::load() working 4d294611d "const" correctness 5e6305c3f fix load_complex() 4a134dc5f start work on utility routines to read complex data from HDF5 9d76a7f41 Merge branch 'main' into feature/hdf5 8f9667a24 whitepsace ebd3fc99e Merge branch 'main' into feature/hdf5 40091b069 comment-out writing tests for now ... need to figure our WAF bulid failure 935aa3459 be sure the dataset has real data 114b9bf33 update release notes bd9c0b26c tweak HighFive utility routines acda1ef57 turn off diagnostics around expected failures 22a748840 readDataSet() utility routine for HighFive bd88a8c25 HighFive writeDataSet() utility to work with our SpanRC 6142f5b33 use HighFive routines to write a HDF5 file 5bbf1abaf Use HiveFive routines to get info about the file 84fbc8378 duplicate unittests with H5Easy f1f054c03 Merge branch 'main' into feature/hdf5 9b63ca470 fix directory names f6f826689 fix directory names 7aeb82c33 Merge branch 'main' into feature/hdf5 d028baaeb hook up HighFive header-only library (#653) 3083b0a31 Revert "HighFive 2.6.2" 246985a7f Revert ""build" HighFive HDF5 library" a8b75a586 Revert "turn off HighFive Boost support" ec68d5f83 Revert "Add HighFive unittests" f1f85b9e7 Revert "get test_high_five_base more-or-less compiling" 5ea634ee1 Revert "more work on getting HighFive unittests to build" ecc45433c more work on getting HighFive unittests to build bb194788a get test_high_five_base more-or-less compiling d42bde000 Add HighFive unittests ddc86bb32 turn off HighFive Boost support b255122d4 "build" HighFive HDF5 library 396cc3ef2 HighFive 2.6.2 5e5f9d9c0 Merge branch 'main' into feature/hdf5 ee938b4a5 changes from SIX bb764df90 Merge branch 'main' into feature/xml.lite_tweaks de2a24380 make derived classes 'final' if possible 14e19bcd2 Change xml lite function to virtual (#645) 8f42ac8e9 Merge branch 'main' into feature/xml.lite_tweaks 18ad90645 hdf5Write unittest 3462e1179 createFile() and writeFile() overloads ecee81d53 fix typos 197eecfa6 sketch-out hdf5::lite::writeFile() bd2311795 use SpanRC for writeFile(), not yet implemented ea9af7510 simple SpanRC to hold a 2D-size and pointer 027c19ee8 createFile() unittest 1f9d07ecb hook up createFile() 8c7e4473f start hooking up HDF5 writing 146e0bea3 Merge branch 'main' into feature/hdf5 88ca9fcb7 Merge branch 'main' into feature/hdf5 42b604b46 Squashed commit of the following: 10ee602c2 Merge branch 'main' into feature/hdf5 67aa42b69 restore changes from "main" 8bbfcbfbf unittests can be simplified to match fewer "view" classes 126bb802e Merge branch 'main' into feature/hdf5 3f8ba7a42 again, don't need a class just to convert from std::vector<> to std::span<> 24c2b489c Squashed commit of the following: 2703c119d Squashed commit of the following: 9d5228a2b don't need an entire class just to convert a std::vector<> into std::span<> 51bc931dc Merge branch 'main' into feature/hdf5 a84f25816 Squashed commit of the following: c4d2ed696 add missing #include guards, fix type in existing #include guard d541525a0 use a single ComplexViewConstIterator for all views 86e6a459f CODA_OSS_disable_warning causes GCC errors :-( 5d4b9c2cb only need an custom iterator for ComplexSpansView d9f0fb128 hook up iterators b9329e4db initial pass at a ComplexViewConstIterator 635238873 remove compiler warning about unused "constexpr" variables b39f6096f use the casing from H5 to make copy/pasting code slightly easier 0887b13eb Merge branch 'main' into feature/hdf5 bd07df1ca Consistent casing for Dataset, Datatype, Dataspace 7acd30ee2 tweak hdf5.lite dependencies 38ab914df Jupyter notebook for creating H5 files 95a040e0b _small.h5 is now (correctly) FLOAT32 107e7c487 make a simple values() member function to avoid template magic e1feca919 use TEST_SPECIFIC_EXCEPTION macro instead of try/catch 738333688 readDatasetT() now throws for the wrong buffer type 6b2cc2529 Merge branch 'feature/hdf5' of github.com:mdaus/coda-oss into feature/hdf5 310f8fd3d can't get template magic right for copy_axis() 86b306d59 stepping through copy ctors in the debugger is annoying f243e92d6 trying to make wrong type of buffer fail 2b10d9652 read in new sample file a28e59d8c help the compiler with type deduction 49bf5e9bc nested_complex_float_data_small.h5 e029325fc utility routines to "deconstruct" and array of std::complex dede3bd39 Merge branch 'main' into feature/hdf5 904b1ef5e tweak class names, make_() and copy() utility routines 8237b9efb make it harder to pass the wrong types to ComplexViews 4d9aeda2c ComplexArrayView and ComplexParallelView utility classes f5e367dfa test std::span> a4a2844f2 read in the nested "i" and "r" data 115615265 sample file has subgroups 8e1b7869a Merge branch 'feature/hdf5' of github.com:mdaus/coda-oss into feature/hdf5 9f4232a1d update sample H5 file 8c55db73a walk through HDF5 sub-groups 7775ed9c4 Update 123_barfoo_catdog_cx.h5 677975d7c Matlab code to create sample H5 file a0e7dfe07 Update test_hdf5info.cpp 0b67e1602 pass __FILE__ and __LINE__ from calling site for a more accurate exception message 86a677321 skeleton for more sample data 85f79b099 Merge branch 'main' into feature/hdf5 18088e942 Merge branch 'main' into feature/hdf5 3a1d17692 Merge branch 'main' into feature/hdf5 1755c69d7 Merge branch 'main' into feature/hdf5 9ad015432 No more "11" suffix on exception names c20d96251 Squashed commit of the following: c88cee999 other values to be filled-in bca4a4ecd incorporation NamedObject from HDF5 docs 61fa68f72 groupInfo() 460e7d766 datasetInfo() 14eb9b764 start filling in DatasetInfo afe5f1c3a start to fill in DatasetInfo 77a968c72 start filling in GroupInfo d81bcdfd9 openGroup() to open groups (loc) a0cd29469 comment-out "dataset" unittest for now 86e006024 begin filling in FileInfo 366dda6ab a return_type_of utility is needed to deduce the return type e21928263 explicitly pass return type to template 4937ccd11 template to reduce boilerplate when calling try_catch_H5Exceptions b3b5ebde7 use new exception utility routines ea1c03ef0 put exception handling/conversion in a utility routine 819a99d39 utility routine for exception handling 6f34eea97 put utilities in a separate file for easier reuse fcbde4f24 break utility routines into smaller pieces for easier reuse 52358ea8a WIN32 no longer automatically defined? 5a4286472 Revert "build HDF5 with C89" 680e599e9 build HDF5 with C89 a87a07121 Merge branch 'main' into feature/hdf5 8447c1a90 Revert "sym-links instead of copying files" db3b5e12b Merge branch 'main' into feature/xml.lite_tweaks fb60b5696 Merge branch 'main' into feature/hdf5 5110a5cc8 Comments about _u and _q 1a937d32c Merge branch 'main' into feature/xml.lite_tweaks fa06f04d7 get ready for hdf5.lite enhancdements b040c7c43 sym-links instead of copying files aa431bb47 use _u for xml::lite::Uri 3d0c6d58c fix case-sensitive #include filename 93dcd0e52 operator() for getElementByName() 75a93af85 more operator[] overloads to make attribute management easier 4ab8216f8 user-defined string literals to remove some noise around xml::lite::QName f82f0b0fc Merge branch 'main' into feature/xml.lite_tweaks ae30e3644 Merge branch 'feature/xml.lite_tweaks' of github.com:mdaus/coda-oss into feature/xml.lite_tweaks ffdd9beb0 simplify attribute creation 9bf5414f5 simplify attribute creation 82d7a4e95 SWIG gets confused about namespaces 7a61d0741 fix bug on Element ctor uncovered by unittest fdd7e58c1 QName is also in the xerces namespace which confuses SWIG bindings a325b7053 operator+=() overload for addChild daf30e6c0 Merge branch 'feature/xml.lite_tweaks' of github.com:mdaus/coda-oss into feature/xml.lite_tweaks b887d2b47 provide overloads for Element& rather than creating new "reference" types 1fa6bba38 rename test_xmleasy.cpp 7c8c9e0f1 += overload 850da6f63 overload for std::string 4547fc5a7 use UIT-8 strings for characterData 4723462a3 convenient addChild() overloads e48720753 copy over ElementReference from xml.easy a4ca30a0d Merge branch 'main' into feature/xml.lite_tweaks 6ae9f0b71 Revert "check-in of new xml.easy (to move code between computers)" f7466a6d7 Revert "simple routines for single element" a5490230d Revert "make some operators simplier ways of calling functions" c9a25630a Revert "get document creation working" 8af8710b0 Revert "free functions instead of member functions" 16c3847cb Revert "ElementReference distinct from Element" 7d68e156f Revert "ElementMutableReference" 00eb2a282 Merge branch 'main' into feature/xml.lite_tweaks a42969c1f ElementMutableReference a20ae9355 ElementReference distinct from Element 14eeeea0b free functions instead of member functions 4aae014b3 get document creation working 883569269 make some operators simplier ways of calling functions 053bd1212 simple routines for single element 8bf701a2e check-in of new xml.easy (to move code between computers) 41f959051 unittests for creating XML documents from scratch 9752d50ae Merge branch 'main' into feature/xml.lite_tweaks 1531d5709 by default, don't validate strings passed to Uri() 46d13d4bf Merge branch 'master' into feature/xml.lite_tweaks 39b547d32 remove more vestiges of Expat and LibXML ec8274d52 remove LibXML and Expat as they're no longer used/supported. 20eeefeef Merge branch 'master' into feature/xml.lite_tweaks 95074b9b1 update for newer Intel compiler 7024f71e1 Merge branch 'master' into feature/xml.lite_tweaks 57b1cbc83 Merge branch 'master' into feature/xml.lite_tweaks 4b67561c3 remove validate() overload that nobody is using fa15f1e5d Squashed commit of the following: 1484a9090 test the new validate() API 470da70fb hookup StringStreamT routines 2cddf2504 begin hooking up validate() overloads 1b5d910f3 overload validate() for UTF-8 and Windows-1252 03309b8c9 Squashed commit of the following: b72c6c5bf older compiler doesn't like our make_unique af8f00307 validate UTF-8 XML on Linux 211188613 unit-test for LEGACY XML validation 3c1169d2b Squashed commit of the following: 3afff19ca std::filesystem::path for FileInputStreamOS 908d452f8 WIP: validate all of our sample XML files 00f9bb16b validate against a XML schema 243d8c356 Merge branch 'master' into feature/xml.lite_tweaks 2815d707d fix to work with SWIG bindings. :-( 460862132 trying (again) to remove vestiages of old code e3c83a858 Revert "new code should use UTF-8" 811207c92 new code should use UTF-8 0ffd835f9 Squashed commit of the following: 1e7e03ded Merge branch 'master' into feature/xml.lite_tweaks c1d806aff Merge branch 'master' into feature/xml.lite_tweaks 850d3c811 str::strip() that can be easier to use than str::trim() 580ba9c8c explicitly =delete move 2b39831a8 Squashed commit of the following: 39eebdc23 Merge branch 'master' into feature/xml.lite_tweaks 9adf86cba force calling new UTF-8 write() routines ea61b6204 Merge branch 'master' into feature/xml.lite_tweaks 8a34583fa overload to take schemaPaths as filesystem::path 8671b442f parse XML embedded in a binary file ec4a902f1 updates from xerces.lite 80dc4d963 updates from xerces.lite 549766d6c Attributes::contains() no longer catches an exception 8a645ceac need "sys/" when building in other environments 36af08269 super-simple URI validation 78ef28a3e SWIG bindings are a PITA! :-( e9cba8491 SWIG needs help with Uri 8a8d8dc07 another routines used by pre-build SWIG bindings 818e1ec5d pre-build SWIG bindings use getElementByTagName() member function 067cac5d8 old compiler gets confused on unadorned QName ba92c0ae7 more use of Uri and QName 446c7d17a use QName in new code d6f8b0c83 more direct use of QName 90fff1c73 use xml::lite::QName instead of tuple 646cbb5ed more direct use of QName and Uri ba589ea3b make QName more robust bab0ee8b5 createElement() -> addNewElement() e3a145747 grab changes from six-library 32285e95c Merge branch 'master' into feature/xml.lite_tweaks 9f79f0bf6 Merge branch 'master' into feature/xml.lite_tweaks a12bbc32c make it easier to create new Elements with a value fc9967f98 make it easy for callers to addChild() keep a reference to the Element 4627766b7 be sure test_xmlparser works in "externals" of other projects bf2276396 "private" is part of the name-mangling fad92bcc8 making sure copy-ctor is implemented f90fdcead consolidate common XML test code 9fc53f2d5 use str:: utility for casting 6da6f794b still trying to find the right macro for SWIG 0c1b86c56 still trying to fix SWIG fdc6fc9bd trying to fix SWIG build error 7835e8c27 SWIG needs copy-ctor 585695942 disable copy/assignment for Element, it's probably almost always wrong 391fed613 fix double-delete caused by copying 61790fe69 retry parsing XML with Windows-1252 if first parse() fails 63cffac59 change string_encoding to match coda-oss style of PascalCase 010479bbe read an XML file we know is wrongly encoded as Windows-1252 9a0505062 more references instead of pointers 2d44b6951 Reading Windows-1252 w/o "encoding" fails 63dc7b076 read Windows-1252 too c9434c9cb test as UIT-8 too f310ccf0c get reading from UTF-8 XML working on Windows 1fa39c2be get testReadUtf8XmlFile working on Linux 1a83cd815 sys::Path is too much trouble right now ed60aa22c unit-test to read XML from a file a9336db7c Squashed commit of the following: 0825beb0d Merge branch 'master' into feature/xml.lite_tweaks c618489be Merge branch 'master' into feature/xml.lite_tweaks e8e4b8fe1 determine string_encoding based on platform 1f43bcfc2 create a new Element by using the platform to determine "characterData" encoding 961bef66b Merge branch 'master' into feature/xml.lite_tweaks e9798a5cb fix static_assert() 6f7772874 Merge branch 'master' into feature/xml.lite_tweaks b98d4f5a9 Merge branch 'master' into feature/xml.lite_tweaks 1b5abba2a The (old) version of SWIG we're using doesn't like certain C++11 features. 53bdeabaf Merge branch 'master' into feature/xml.lite_tweaks 60cf8ae80 "" doesn't work with decltype() in older C++ 97e72477a reduce getValue() overloads by making "key" a template argument 5e6373e55 reduce code duplication f9e7cfeee provide castValue instead of getValue(T&) cbd0bd8f2 castValue throws instead of returning a bool like getValue(T&) 87c7514fc Merge branch 'master' into feature/xml.lite_tweaks 10cc61223 make getElement*() consistent for zero or >1 results f5b137e3c Merge branch 'master' into feature/xml.lite_tweaks 1765efc62 allow clients to specify toType() and toString() for getValue() and setValue() df8b746e1 allow clients to specify their own toType/toString routines 66702726a Merge branch 'master' into feature/xml.lite_tweaks 6956311f1 Merge branch 'master' into feature/xml.lite_tweaks d505f3593 Merge branch 'master' into feature/xml.lite_tweaks fbd106115 catch a BadCastException and return false from getValue() 3a78377b5 use a template to reduce duplicated code 0ad4b8606 Merge branch 'master' into feature/xml.lite_tweaks a848aa3a2 get & set the characer data as a type f3ee1ee12 utility routines to set an attribute value 595227683 templates to get an attribute value convert to a specific type 06639227b miised a change in last commit 1aa458ef8 add getValue() overloads that return true/false rather than throwing faa6d3075 added getElementByTagName() overloads as that's a very common use-case git-subtree-dir: externals/coda-oss git-subtree-split: 54033e70e353da94340dd7b96d0b1c6652308952 commit fec3755e04a8311103aef1ded477b17ce826b044 Author: Dan Smith Date: Mon Jun 19 14:18:05 2023 -0400 latest from CODA-OSS * std::numbers::pi instead of M_PI * `long double` doesn't change results from `float` but prevents AVX/SSE * w/C++17 * it seems is broken with GCC 9.x ? * overload to return the converted data in a std::vector * use overload which returns a std::vector<> * remove unused overloads * use std::as_bytes() * more use of AMP8I_PHS8I_t rather than std::pair * use fromComplex overload returning a std::vector * cx_float -> zfloat * getPhase() utility routine * separate nearest_neighbors() member function not needed * std::complex -> six::zfloat * use std::mdspan to simplify the lookup table * new 8AMPI_PHSI project * remove testing_fromComplex_() routine * add a nearest_neighbors_unrolled() routine * remove cache * use some maps to cache values * map.lower_bound() * remove _cached() * lower_bound utility * get ready to try AVX2 * add vectorclass * build w/C++17 * first pass at using vcl * more use of VCL * remove "map" as the speedup isn't worth the complexity to multi-thread * nearest_neighbors_seq() and nearest_neighbors_par() * different implementation of find_nearest_2() * get_phase_vcl() * find_nearest_vcl() * nearest_neighbors_unseq_4() * nearest_neighbors_unseq_n() * nearest_neighbors_unseq_8() * nearest_neighbors_par_unseq() * transform_async() utility * find values for par_unseq * make nearest_neighbors_unseq_n() so we don't have to pass as many parameters * if_add() instead of select() * lookup() * use _unseq for testing * nearest_() * lower_bound() * interleave() utility * move VCL and nearest_neighbors_unseq() into a separate file * get store_partial() working * arg() utility * find_nearest() utility * reduce use of templates * interleave() and store() is slower than an explicit loop. * find_nearest() as member-function so it can be called from multiple modules * trying to find the fastest use of SIMD * this seems to be the fastest so far ... * six::AmplitudeTableSize instead of hard-coded values * store magnitudes in a fixed size array * store real and imginary phase_direction components separately * build VCL on Linux * account for moved sample file * tweak thresholds * build on Windows w/CMake * macros to turn off VCL and/or std::experimental::simd * std::experimental::simd needs C++20 * remove vectorclass, it needs C++17 * restore externals to 'main' * restore more changes from 'main' * restore more changes from 'main' * restore more changes from 'main' * restore more changes from 'main' * build new 8AMPI_PHSI project * not ready for std::experimental::simd * WIP: custom iterators * put private stuff in an Impl class so it can be passed around easier * figured out lower_bound_() with VCL * allow for both VCL and SIMD at the same time * test for multiple of 8 outside the loop * horizonal_or() is faster than horizontal_add() * get rid of more templates * SIMD * parallel + unseq not working yet * SIMD changes from other branches * first pass at "poor man's" SIMD * new Ximd from CODA-OSS * update Ximd.h from CODA-OSS * fix compiler error * restore vectorclass * fix compiler error * restore C++17 * restore changes lost by slamming-in 'cpp17' * latest from 'cpp17' * most config files are generated * restore changes lost with slamming-in cpp17 * consolidating UNSEQ implemntations * consolidating UNSEQ implemntations * latest from CODA-OSS * eliminate duplicate XIMD implementation * fixed signed/unsigned warnings * instead of for C++14/17 * another VCL warning * latest from CPP17 * config.h * always implement the available SIMD routines, even if not used * ssize() for Ximd::zfloatv --------- Co-authored-by: Andrew Hardin --- UnitTest/UnitTest.vcxproj | 1 + .../libtiff/tiff-4.6.0/build/CMakeLists.txt | 23 - .../libtiff/tiff-4.6.0/build/Makefile.am | 32 - .../libtiff/tiff-4.6.0/build/Makefile.in | 677 ---------------- .../drivers/libtiff/tiff-4.6.0/build/README | 3 - .../libtiff/tiff-4.6.0/port/libport_config.h | 13 - six/modules/c++/samples/8AMPI_PHSI.cpp | 2 +- .../8AMPI_PHSI.dir/8AMPI_PHSI.dir.vcxproj | 4 + six/modules/c++/samples/CMakeLists.txt | 1 + six/modules/c++/samples/wscript | 1 + six/modules/c++/six.sicd/CMakeLists.txt | 2 + six/modules/c++/six.sicd/six.sicd.vcxproj | 2 + .../c++/six.sicd/six.sicd.vcxproj.filters | 6 + .../six.sicd/source/ComplexToAMP8IPHS8I.cpp | 133 +-- .../source/ComplexToAMP8IPHS8I_simd.cpp | 377 +++++++++ .../source/ComplexToAMP8IPHS8I_unseq.cpp | 756 ++++++++++++++++++ .../source/ComplexToAMP8IPHS8I_vcl.cpp | 239 ------ .../c++/six/include/six/AmplitudeTable.h | 106 ++- 18 files changed, 1306 insertions(+), 1072 deletions(-) delete mode 100644 externals/coda-oss/modules/drivers/libtiff/tiff-4.6.0/build/CMakeLists.txt delete mode 100644 externals/coda-oss/modules/drivers/libtiff/tiff-4.6.0/build/Makefile.am delete mode 100644 externals/coda-oss/modules/drivers/libtiff/tiff-4.6.0/build/Makefile.in delete mode 100644 externals/coda-oss/modules/drivers/libtiff/tiff-4.6.0/build/README delete mode 100644 externals/coda-oss/modules/drivers/libtiff/tiff-4.6.0/port/libport_config.h create mode 100644 six/modules/c++/six.sicd/source/ComplexToAMP8IPHS8I_simd.cpp create mode 100644 six/modules/c++/six.sicd/source/ComplexToAMP8IPHS8I_unseq.cpp delete mode 100644 six/modules/c++/six.sicd/source/ComplexToAMP8IPHS8I_vcl.cpp diff --git a/UnitTest/UnitTest.vcxproj b/UnitTest/UnitTest.vcxproj index b87de72415..dec393e567 100644 --- a/UnitTest/UnitTest.vcxproj +++ b/UnitTest/UnitTest.vcxproj @@ -71,6 +71,7 @@ stdc11 true Guard + ProgramDatabase Windows diff --git a/externals/coda-oss/modules/drivers/libtiff/tiff-4.6.0/build/CMakeLists.txt b/externals/coda-oss/modules/drivers/libtiff/tiff-4.6.0/build/CMakeLists.txt deleted file mode 100644 index 756fb7164e..0000000000 --- a/externals/coda-oss/modules/drivers/libtiff/tiff-4.6.0/build/CMakeLists.txt +++ /dev/null @@ -1,23 +0,0 @@ -# CMake build for libtiff -# -# Copyright © 2015 Open Microscopy Environment / University of Dundee -# Written by Roger Leigh -# -# Permission to use, copy, modify, distribute, and sell this software and -# its documentation for any purpose is hereby granted without fee, provided -# that (i) the above copyright notices and this permission notice appear in -# all copies of the software and related documentation, and (ii) the names of -# Sam Leffler and Silicon Graphics may not be used in any advertising or -# publicity relating to the software without the specific, prior written -# permission of Sam Leffler and Silicon Graphics. -# -# THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, -# EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY -# WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. -# -# IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR -# ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, -# OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, -# WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF -# LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE -# OF THIS SOFTWARE. diff --git a/externals/coda-oss/modules/drivers/libtiff/tiff-4.6.0/build/Makefile.am b/externals/coda-oss/modules/drivers/libtiff/tiff-4.6.0/build/Makefile.am deleted file mode 100644 index c912a422af..0000000000 --- a/externals/coda-oss/modules/drivers/libtiff/tiff-4.6.0/build/Makefile.am +++ /dev/null @@ -1,32 +0,0 @@ -# -# Tag Image File Format (TIFF) Software -# -# Copyright (C) 2007, Andrey Kiselev -# -# Permission to use, copy, modify, distribute, and sell this software and -# its documentation for any purpose is hereby granted without fee, provided -# that (i) the above copyright notices and this permission notice appear in -# all copies of the software and related documentation, and (ii) the names of -# Sam Leffler and Silicon Graphics may not be used in any advertising or -# publicity relating to the software without the specific, prior written -# permission of Sam Leffler and Silicon Graphics. -# -# THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, -# EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY -# WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. -# -# IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR -# ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, -# OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, -# WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF -# LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE -# OF THIS SOFTWARE. - -# Process this file with automake to produce Makefile.in. - -EXTRA_DIST = \ - CMakeLists.txt \ - README - -SUBDIRS = - diff --git a/externals/coda-oss/modules/drivers/libtiff/tiff-4.6.0/build/Makefile.in b/externals/coda-oss/modules/drivers/libtiff/tiff-4.6.0/build/Makefile.in deleted file mode 100644 index 77dd6a8210..0000000000 --- a/externals/coda-oss/modules/drivers/libtiff/tiff-4.6.0/build/Makefile.in +++ /dev/null @@ -1,677 +0,0 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2018 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# -# Tag Image File Format (TIFF) Software -# -# Copyright (C) 2007, Andrey Kiselev -# -# Permission to use, copy, modify, distribute, and sell this software and -# its documentation for any purpose is hereby granted without fee, provided -# that (i) the above copyright notices and this permission notice appear in -# all copies of the software and related documentation, and (ii) the names of -# Sam Leffler and Silicon Graphics may not be used in any advertising or -# publicity relating to the software without the specific, prior written -# permission of Sam Leffler and Silicon Graphics. -# -# THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, -# EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY -# WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. -# -# IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR -# ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, -# OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, -# WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF -# LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE -# OF THIS SOFTWARE. - -# Process this file with automake to produce Makefile.in. -VPATH = @srcdir@ -am__is_gnu_make = { \ - if test -z '$(MAKELEVEL)'; then \ - false; \ - elif test -n '$(MAKE_HOST)'; then \ - true; \ - elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ - true; \ - else \ - false; \ - fi; \ -} -am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ - *) echo "am__make_running_with_option: internal error: invalid" \ - "target option '$${target_option-}' specified" >&2; \ - exit 1;; \ - esac; \ - has_opt=no; \ - sane_makeflags=$$MAKEFLAGS; \ - if $(am__is_gnu_make); then \ - sane_makeflags=$$MFLAGS; \ - else \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - bs=\\; \ - sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ - | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ - esac; \ - fi; \ - skip_next=no; \ - strip_trailopt () \ - { \ - flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ - }; \ - for flg in $$sane_makeflags; do \ - test $$skip_next = yes && { skip_next=no; continue; }; \ - case $$flg in \ - *=*|--*) continue;; \ - -*I) strip_trailopt 'I'; skip_next=yes;; \ - -*I?*) strip_trailopt 'I';; \ - -*O) strip_trailopt 'O'; skip_next=yes;; \ - -*O?*) strip_trailopt 'O';; \ - -*l) strip_trailopt 'l'; skip_next=yes;; \ - -*l?*) strip_trailopt 'l';; \ - -[dEDm]) skip_next=yes;; \ - -[JT]) skip_next=yes;; \ - esac; \ - case $$flg in \ - *$$target_option*) has_opt=yes; break;; \ - esac; \ - done; \ - test $$has_opt = yes -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = build -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config/config.h \ - $(top_builddir)/libtiff/tif_config.h \ - $(top_builddir)/libtiff/tiffconf.h \ - $(top_builddir)/port/libport_config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ - ctags-recursive dvi-recursive html-recursive info-recursive \ - install-data-recursive install-dvi-recursive \ - install-exec-recursive install-html-recursive \ - install-info-recursive install-pdf-recursive \ - install-ps-recursive install-recursive installcheck-recursive \ - installdirs-recursive pdf-recursive ps-recursive \ - tags-recursive uninstall-recursive -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive -am__recursive_targets = \ - $(RECURSIVE_TARGETS) \ - $(RECURSIVE_CLEAN_TARGETS) \ - $(am__extra_recursive_targets) -AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir distdir-am -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -# Read a list of newline-separated strings from the standard input, -# and print each of them once, without duplicates. Input order is -# *not* preserved. -am__uniquify_input = $(AWK) '\ - BEGIN { nonempty = 0; } \ - { items[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in items) print i; }; } \ -' -# Make sure the list of sources is unique. This is necessary because, -# e.g., the same source file might be shared among _SOURCES variables -# for different programs/libraries. -am__define_uniq_tagged_files = \ - list='$(am__tagged_files)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -am__DIST_COMMON = $(srcdir)/Makefile.in README -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -am__relativize = \ - dir0=`pwd`; \ - sed_first='s,^\([^/]*\)/.*$$,\1,'; \ - sed_rest='s,^[^/]*/*,,'; \ - sed_last='s,^.*/\([^/]*\)$$,\1,'; \ - sed_butlast='s,/*[^/]*$$,,'; \ - while test -n "$$dir1"; do \ - first=`echo "$$dir1" | sed -e "$$sed_first"`; \ - if test "$$first" != "."; then \ - if test "$$first" = ".."; then \ - dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ - dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ - else \ - first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ - if test "$$first2" = "$$first"; then \ - dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ - else \ - dir2="../$$dir2"; \ - fi; \ - dir0="$$dir0"/"$$first"; \ - fi; \ - fi; \ - dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ - done; \ - reldir="$$dir2" -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CMAKE = @CMAKE@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBDIR = @LIBDIR@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTIFF_ALPHA_VERSION = @LIBTIFF_ALPHA_VERSION@ -LIBTIFF_DOCDIR = @LIBTIFF_DOCDIR@ -LIBTIFF_MAJOR_VERSION = @LIBTIFF_MAJOR_VERSION@ -LIBTIFF_MICRO_VERSION = @LIBTIFF_MICRO_VERSION@ -LIBTIFF_MINOR_VERSION = @LIBTIFF_MINOR_VERSION@ -LIBTIFF_RELEASE_DATE = @LIBTIFF_RELEASE_DATE@ -LIBTIFF_VERSION = @LIBTIFF_VERSION@ -LIBTIFF_VERSION_INFO = @LIBTIFF_VERSION_INFO@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_BIN = @PYTHON_BIN@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SPHINX_BUILD = @SPHINX_BUILD@ -STRIP = @STRIP@ -TIFF_MAN1_GEN = @TIFF_MAN1_GEN@ -TIFF_MAN1_PREBUILT = @TIFF_MAN1_PREBUILT@ -TIFF_MAN3_GEN = @TIFF_MAN3_GEN@ -TIFF_MAN3_PREBUILT = @TIFF_MAN3_PREBUILT@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -runstatedir = @runstatedir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -tiff_libs_private = @tiff_libs_private@ -tiff_requires_private = @tiff_requires_private@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -EXTRA_DIST = \ - CMakeLists.txt \ - README - -SUBDIRS = -all: all-recursive - -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign build/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign build/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -# This directory's subdirectories are mostly independent; you can cd -# into them and run 'make' without going through this Makefile. -# To change the values of 'make' variables: instead of editing Makefiles, -# (1) if the variable is set in 'config.status', edit 'config.status' -# (which will cause the Makefiles to be regenerated when you run 'make'); -# (2) otherwise, pass the desired values on the 'make' command line. -$(am__recursive_targets): - @fail=; \ - if $(am__make_keepgoing); then \ - failcom='fail=yes'; \ - else \ - failcom='exit 1'; \ - fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -ID: $(am__tagged_files) - $(am__define_uniq_tagged_files); mkid -fID $$unique -tags: tags-recursive -TAGS: tags - -tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: ctags-recursive - -CTAGS: ctags -ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -cscopelist: cscopelist-recursive - -cscopelist-am: $(am__tagged_files) - list='$(am__tagged_files)'; \ - case "$(srcdir)" in \ - [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ - *) sdir=$(subdir)/$(srcdir) ;; \ - esac; \ - for i in $$list; do \ - if test -f "$$i"; then \ - echo "$(subdir)/$$i"; \ - else \ - echo "$$sdir/$$i"; \ - fi; \ - done >> $(top_builddir)/cscope.files - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) distdir-am - -distdir-am: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - $(am__make_dryrun) \ - || test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ - dir1=$$subdir; dir2="$(top_distdir)"; \ - $(am__relativize); \ - new_top_distdir=$$reldir; \ - echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ - echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ - ($(am__cd) $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$new_top_distdir" \ - distdir="$$new_distdir" \ - am__remove_distdir=: \ - am__skip_length_check=: \ - am__skip_mode_fix=: \ - distdir) \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-recursive -all-am: Makefile -installdirs: installdirs-recursive -installdirs-am: -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-recursive - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -html-am: - -info: info-recursive - -info-am: - -install-data-am: - -install-dvi: install-dvi-recursive - -install-dvi-am: - -install-exec-am: - -install-html: install-html-recursive - -install-html-am: - -install-info: install-info-recursive - -install-info-am: - -install-man: - -install-pdf: install-pdf-recursive - -install-pdf-am: - -install-ps: install-ps-recursive - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: - -.MAKE: $(am__recursive_targets) install-am install-strip - -.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ - check-am clean clean-generic clean-libtool cscopelist-am ctags \ - ctags-am distclean distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-am uninstall uninstall-am - -.PRECIOUS: Makefile - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/externals/coda-oss/modules/drivers/libtiff/tiff-4.6.0/build/README b/externals/coda-oss/modules/drivers/libtiff/tiff-4.6.0/build/README deleted file mode 100644 index f765efc85f..0000000000 --- a/externals/coda-oss/modules/drivers/libtiff/tiff-4.6.0/build/README +++ /dev/null @@ -1,3 +0,0 @@ -This directory contains scripts and tools needed to build libtiff library -and its utilities in various environments. - diff --git a/externals/coda-oss/modules/drivers/libtiff/tiff-4.6.0/port/libport_config.h b/externals/coda-oss/modules/drivers/libtiff/tiff-4.6.0/port/libport_config.h deleted file mode 100644 index 34aa1e3080..0000000000 --- a/externals/coda-oss/modules/drivers/libtiff/tiff-4.6.0/port/libport_config.h +++ /dev/null @@ -1,13 +0,0 @@ -/* port/libport_config.h. Generated from libport_config.h.in by configure. */ -/* libtiff/libport_config.h.in. Not generated, but originated from autoheader. */ - -#ifndef _LIBPORT_CONFIG_H_ -#define _LIBPORT_CONFIG_H_ - -/* Define to 1 if you have the `getopt' function. */ -#define HAVE_GETOPT 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_UNISTD_H 1 - -#endif /* _LIBPORT_CONFIG_H_ */ diff --git a/six/modules/c++/samples/8AMPI_PHSI.cpp b/six/modules/c++/samples/8AMPI_PHSI.cpp index af79cc4d18..5ceff52f6b 100644 --- a/six/modules/c++/samples/8AMPI_PHSI.cpp +++ b/six/modules/c++/samples/8AMPI_PHSI.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include #include diff --git a/six/modules/c++/samples/8AMPI_PHSI.dir/8AMPI_PHSI.dir.vcxproj b/six/modules/c++/samples/8AMPI_PHSI.dir/8AMPI_PHSI.dir.vcxproj index f65f3e8f7f..48bd3c6497 100644 --- a/six/modules/c++/samples/8AMPI_PHSI.dir/8AMPI_PHSI.dir.vcxproj +++ b/six/modules/c++/samples/8AMPI_PHSI.dir/8AMPI_PHSI.dir.vcxproj @@ -66,6 +66,8 @@ true MultiThreadedDebugDLL true + stdcpp17 + stdc11 Console @@ -91,6 +93,8 @@ Speed Guard true + stdcpp17 + stdc11 Console diff --git a/six/modules/c++/samples/CMakeLists.txt b/six/modules/c++/samples/CMakeLists.txt index e0527df401..96238f7ebf 100644 --- a/six/modules/c++/samples/CMakeLists.txt +++ b/six/modules/c++/samples/CMakeLists.txt @@ -18,6 +18,7 @@ add_sample(extract_cphd_xml cli-c++ cphd-c++ xml.lite-c++) add_sample(image_to_scene six.sicd-c++ six.sidd-c++) add_sample(project_slant_to_output cli-c++ io-c++ six-c++ six.sicd-c++ sio.lite-c++) add_sample(round_trip_six cli-c++ six.convert-c++ six.sicd-c++ six.sidd-c++) +add_sample(8AMPI_PHSI six.sicd-c++) add_sample(sicd_output_plane_pixel_to_lat_lon cli-c++ six.sicd-c++) add_sample(test_compare_sidd cli-c++ six.sicd-c++ six.sidd-c++) add_sample(test_create_sicd cli-c++ six.sicd-c++ sio.lite-c++) diff --git a/six/modules/c++/samples/wscript b/six/modules/c++/samples/wscript index 498d294afd..6de4750b5d 100644 --- a/six/modules/c++/samples/wscript +++ b/six/modules/c++/samples/wscript @@ -12,6 +12,7 @@ def build(bld): 'project_slant_to_output' : 'cli io six six.sicd sio.lite', 'image_to_scene' : 'six.sicd six.sidd', 'round_trip_six' : 'cli six.convert six.sicd six.sidd', + '8AMPI_PHSI' : 'six.sicd', 'test_create_sicd' : 'cli six.sicd sio.lite', 'test_create_sicd_from_mem' : 'cli six.sicd', 'test_create_sidd_from_mem' : 'cli six.sicd six.sidd', diff --git a/six/modules/c++/six.sicd/CMakeLists.txt b/six/modules/c++/six.sicd/CMakeLists.txt index 31a6e143c6..5034b0d616 100644 --- a/six/modules/c++/six.sicd/CMakeLists.txt +++ b/six/modules/c++/six.sicd/CMakeLists.txt @@ -8,6 +8,8 @@ coda_add_module( source/ComplexData.cpp source/ComplexDataBuilder.cpp source/ComplexToAMP8IPHS8I.cpp + source/ComplexToAMP8IPHS8I_unseq.cpp + source/ComplexToAMP8IPHS8I_simd.cpp source/ComplexXMLControl.cpp source/ComplexXMLParser.cpp source/ComplexXMLParser040.cpp diff --git a/six/modules/c++/six.sicd/six.sicd.vcxproj b/six/modules/c++/six.sicd/six.sicd.vcxproj index 639fc99c4d..ea0e7829c0 100644 --- a/six/modules/c++/six.sicd/six.sicd.vcxproj +++ b/six/modules/c++/six.sicd/six.sicd.vcxproj @@ -160,6 +160,8 @@ + + diff --git a/six/modules/c++/six.sicd/six.sicd.vcxproj.filters b/six/modules/c++/six.sicd/six.sicd.vcxproj.filters index 4f4d855cf4..7483d72841 100644 --- a/six/modules/c++/six.sicd/six.sicd.vcxproj.filters +++ b/six/modules/c++/six.sicd/six.sicd.vcxproj.filters @@ -248,5 +248,11 @@ Source Files + + Source Files + + + Source Files + \ No newline at end of file diff --git a/six/modules/c++/six.sicd/source/ComplexToAMP8IPHS8I.cpp b/six/modules/c++/six.sicd/source/ComplexToAMP8IPHS8I.cpp index 0c08b04475..adfd970592 100644 --- a/six/modules/c++/six.sicd/source/ComplexToAMP8IPHS8I.cpp +++ b/six/modules/c++/six.sicd/source/ComplexToAMP8IPHS8I.cpp @@ -29,6 +29,7 @@ #include #include #include +#include #include #if CODA_OSS_cpp17 @@ -83,7 +84,7 @@ inline auto GetPhase(std::complex v) if (phase < 0.0) phase += std::numbers::pi * 2.0; // Wrap from [0, 2PI] return phase; } -uint8_t six::sicd::details::ComplexToAMP8IPHS8I::getPhase(six::zfloat v) const +uint8_t six::sicd::details::ComplexToAMP8IPHS8I::Impl::getPhase(six::zfloat v) const { // Phase is determined via arithmetic because it's equally spaced. const auto phase = GetPhase(v); @@ -144,23 +145,29 @@ static std::span get_magnitudes(const six::AmplitudeTable* pAmplitu return sys::make_const_span(uncached_magnitudes); } + six::sicd::details::ComplexToAMP8IPHS8I::ComplexToAMP8IPHS8I(const six::AmplitudeTable *pAmplitudeTable) - : magnitudes(get_magnitudes(pAmplitudeTable, uncached_magnitudes)) + :impl(*this) { + impl.magnitudes = get_magnitudes(pAmplitudeTable, impl.uncached_magnitudes); + const auto p0 = GetPhase(Utilities::toComplex(1, 0, pAmplitudeTable)); const auto p1 = GetPhase(Utilities::toComplex(1, 1, pAmplitudeTable)); assert(p0 == 0.0); assert(p1 > p0); - phase_delta = gsl::narrow_cast(p1 - p0); + impl.phase_delta = gsl::narrow_cast(p1 - p0); for(size_t i = 0; i < 256; i++) { - const units::Radians angle{ static_cast(p0) + i * phase_delta }; + const units::Radians angle{ static_cast(p0) + i * impl.phase_delta }; float y, x; SinCos(angle, y, x); - phase_directions[i] = { x, y }; + impl.phase_directions[i] = { x, y }; - phase_directions_real[i] = phase_directions[i].real(); - phase_directions_imag[i] = phase_directions[i].imag(); + // Only need the parallel array when using the "vectorclass" library. + #ifdef SIX_sicd_has_VCL + impl.phase_directions_real[i] = impl.phase_directions[i].real(); + impl.phase_directions_imag[i] = impl.phase_directions[i].imag(); + #endif } } @@ -184,7 +191,7 @@ static uint8_t nearest(std::span magnitudes, float value) assert(distance <= std::numeric_limits::max()); return gsl::narrow(distance); } -uint8_t six::sicd::details::ComplexToAMP8IPHS8I::find_nearest(six::zfloat phase_direction, six::zfloat v) const +uint8_t six::sicd::details::ComplexToAMP8IPHS8I::Impl::find_nearest(six::zfloat phase_direction, six::zfloat v) const { // We have to do a 1D nearest neighbor search for magnitude. // But it's not the magnitude of the input complex value - it's the projection of @@ -197,16 +204,16 @@ uint8_t six::sicd::details::ComplexToAMP8IPHS8I::find_nearest(six::zfloat phase_ six::AMP8I_PHS8I_t six::sicd::details::ComplexToAMP8IPHS8I::nearest_neighbor_(const six::zfloat &v) const { six::AMP8I_PHS8I_t retval; - retval.phase = getPhase(v); + retval.phase = impl.getPhase(v); - auto&& phase_direction = phase_directions[retval.phase]; - retval.amplitude = find_nearest(phase_direction, v); + auto&& phase_direction = impl.phase_directions[retval.phase]; + retval.amplitude = impl.find_nearest(phase_direction, v); return retval; } -template -void six::sicd::details::ComplexToAMP8IPHS8I::nearest_neighbors_seq(TInputIt first, TInputIt last, TOutputIt dest) const +void six::sicd::details::ComplexToAMP8IPHS8I::Impl::nearest_neighbors_seq(std::span inputs, std::span results) const { - std::transform(first, last, dest, [&](const auto& v) { return nearest_neighbor_(v); }); + std::transform(inputs.begin(), inputs.end(), results.begin(), + [&](const auto& v) { return converter.nearest_neighbor_(v); }); } std::vector six::sicd::details::ComplexToAMP8IPHS8I::nearest_neighbors_seq( std::span inputs, const six::AmplitudeTable* pAmplitudeTable) @@ -215,7 +222,7 @@ std::vector six::sicd::details::ComplexToAMP8IPHS8I::nearest const auto& converter = make_(pAmplitudeTable); std::vector retval(inputs.size()); - converter.nearest_neighbors_seq(inputs.begin(), inputs.end(), retval.begin()); + converter.impl.nearest_neighbors_seq(inputs, retval); return retval; } @@ -249,13 +256,16 @@ static inline OutputIt transform_async(const InputIt first1, const InputIt last1 return handle.get(); } -template -void six::sicd::details::ComplexToAMP8IPHS8I::nearest_neighbors_par(TInputIt first, TInputIt last, TOutputIt dest) const +void six::sicd::details::ComplexToAMP8IPHS8I::Impl::nearest_neighbors_par(std::span inputs, std::span results) const { const auto nearest_neighbor = [&](const auto& v) { - return this->nearest_neighbor_(v); + return converter.nearest_neighbor_(v); }; + + const auto first = inputs.begin(); + const auto last = inputs.end(); + const auto dest = results.begin(); #if SIX_six_sicd_ComplexToAMP8IPHS8I_has_execution std::ignore = std::transform(std::execution::par, first, last, dest, nearest_neighbor); @@ -266,7 +276,7 @@ void six::sicd::details::ComplexToAMP8IPHS8I::nearest_neighbors_par(TInputIt fir constexpr auto default_cutoff = (dimension * dimension) * 4; const auto cutoff = cutoff_ == 0 ? default_cutoff : cutoff_; - const auto transform_f = [&](const TInputIt first1, const TInputIt last1, TOutputIt d_first) + const auto transform_f = [&](auto first1, auto last1, auto d_first) { return std::transform(first1, last1, d_first, nearest_neighbor); }; @@ -280,7 +290,7 @@ std::vector six::sicd::details::ComplexToAMP8IPHS8I::nearest const auto& converter = make_(pAmplitudeTable); std::vector retval(inputs.size()); - converter.nearest_neighbors_par(inputs.begin(), inputs.end(), retval.begin()); + converter.impl.nearest_neighbors_par(inputs, sys::make_span(retval)); return retval; } @@ -289,42 +299,75 @@ std::vector six::sicd::details::ComplexToAMP8IPHS8I::nearest { // TODO: there could be more complicated logic here to decide between // _seq, _par, _unseq, and _par_unseq - #if SIX_sicd_have_VCL || SIX_sicd_have_experimental_simd - return nearest_neighbors_par_unseq(inputs, pAmplitudeTable); + #if SIX_sicd_ComplexToAMP8IPHS8I_unseq + + // None of our SIMD implementations are dramatically slower when + // running unittests; that's mostly because there's lots of IO. So that + // the more interesting code-path is tested, use UNSEQ in debugging. + #if CODA_OSS_DEBUG + return nearest_neighbors_unseq(inputs, pAmplitudeTable); // TODO: #else return nearest_neighbors_par(inputs, pAmplitudeTable); #endif -} - -template -void six::sicd::details::ComplexToAMP8IPHS8I::nearest_neighbors_par_unseq(TInputIt first, TInputIt last, TOutputIt dest) const -{ - constexpr ptrdiff_t cutoff_ = 0; // too slow w/o multi-threading - // The value of "default_cutoff" was determined by testing; there is nothing special about it, feel free to change it. - constexpr auto default_cutoff = (256 * 256) * 2; - const auto cutoff = cutoff_ == 0 ? default_cutoff : cutoff_; + #else + return nearest_neighbors_par(inputs, pAmplitudeTable); - const auto transform_f = [&](const TInputIt first1, const TInputIt last1, TOutputIt d_first) - { - nearest_neighbors_unseq(first1, last1, d_first); - static const TOutputIt retval; - return retval; - }; - std::ignore = transform_async(first, last, dest, transform_f, cutoff); +#endif } + #if SIX_sicd_ComplexToAMP8IPHS8I_unseq -std::vector six::sicd::details::ComplexToAMP8IPHS8I::nearest_neighbors_par_unseq( +std::vector six::sicd::details::ComplexToAMP8IPHS8I::nearest_neighbors_unseq( std::span inputs, const six::AmplitudeTable* pAmplitudeTable) { - // make a structure to quickly find the nearest neighbor - const auto& converter = make_(pAmplitudeTable); + // TODO: there could be more complicated logic here to determine which UNSEQ + // implementation to use. - std::vector retval(inputs.size()); - converter.nearest_neighbors_par_unseq(inputs.begin(), inputs.end(), retval.begin()); - return retval; + #if SIX_sicd_has_VCL + return nearest_neighbors_unseq_vcl(inputs, pAmplitudeTable); + + #elif SIX_sicd_has_simd + return nearest_neighbors_unseq_simd(inputs, pAmplitudeTable); + + #elif SIX_sicd_has_ximd + return nearest_neighbors_unseq_ximd(inputs, pAmplitudeTable); + + #else + #error "Don't know how to implement nearest_neighbors_unseq()" + throw std::logic_error("Don't know how to implement nearest_neighbors_unseq()"); + + #endif } -#endif // SIX_sicd_have_VCL || SIX_sicd_have_experimental_simd +#endif // SIX_sicd_ComplexToAMP8IPHS8I_unseq + +//template +//void six::sicd::details::ComplexToAMP8IPHS8I::Impl::nearest_neighbors_par_unseq(TInputIt first, TInputIt last, TOutputIt dest) const +//{ +// constexpr ptrdiff_t cutoff_ = 0; // too slow w/o multi-threading +// // The value of "default_cutoff" was determined by testing; there is nothing special about it, feel free to change it. +// constexpr auto default_cutoff = (256 * 256) * 2; +// const auto cutoff = cutoff_ == 0 ? default_cutoff : cutoff_; +// +// const auto transform_f = [&](const TInputIt first1, const TInputIt last1, TOutputIt d_first) +// { +// nearest_neighbors_unseq(first1, last1, d_first); +// static const TOutputIt retval; +// return retval; +// }; +// std::ignore = transform_async(first, last, dest, transform_f, cutoff); +//} +//#if SIX_sicd_ComplexToAMP8IPHS8I_unseq +//std::vector six::sicd::details::ComplexToAMP8IPHS8I::nearest_neighbors_par_unseq( +// std::span inputs, const six::AmplitudeTable* pAmplitudeTable) +//{ +// // make a structure to quickly find the nearest neighbor +// const auto& converter = make_(pAmplitudeTable); +// +// std::vector retval(inputs.size()); +// converter.impl.nearest_neighbors_par_unseq(inputs.begin(), inputs.end(), retval.begin()); +// return retval; +//} +//#endif // SIX_sicd_ComplexToAMP8IPHS8I_unseq const six::sicd::details::ComplexToAMP8IPHS8I& six::sicd::details::ComplexToAMP8IPHS8I::make_(const six::AmplitudeTable* pAmplitudeTable) { diff --git a/six/modules/c++/six.sicd/source/ComplexToAMP8IPHS8I_simd.cpp b/six/modules/c++/six.sicd/source/ComplexToAMP8IPHS8I_simd.cpp new file mode 100644 index 0000000000..ece707b2f9 --- /dev/null +++ b/six/modules/c++/six.sicd/source/ComplexToAMP8IPHS8I_simd.cpp @@ -0,0 +1,377 @@ +/* ========================================================================= +* This file is part of six.sicd-c++ +* ========================================================================= +* +* (C) Copyright 2021, Maxar Technologies, Inc. +* +* six.sicd-c++ is free software; you can redistribute it and/or modify +* it under the terms of the GNU Lesser General Public License as published by +* the Free Software Foundation; either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this program; If not, +* see . +* +*/ +#include "six/AmplitudeTable.h" + +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include "six/sicd/Utilities.h" + +#if SIX_sicd_has_simd + +#include + +// https://en.cppreference.com/w/cpp/experimental/simd/simd_cast +// > The TS specification is missing `simd_cast` and `static_simd_cast` overloads for `simd_mask`. ... +namespace stdx +{ + using namespace std::experimental; + using namespace std::experimental::__proposed; +} + +// https://en.cppreference.com/w/cpp/experimental/simd +using floatv = stdx::native_simd; +// using doublev = stdx::rebind_simd_t; +using intv = stdx::rebind_simd_t; +using zfloatv = std::array; + +auto& real(zfloatv& z) +{ + return z[0]; +} +const auto& real(const zfloatv& z) +{ + return z[0]; +} +auto& imag(zfloatv& z) +{ + return z[1]; +} +const auto& imag(const zfloatv& z) +{ + return z[1]; +} + +// https://en.cppreference.com/w/cpp/experimental/simd/simd/simd +template +inline auto make_zfloatv(TGeneratorReal&& generate_real, TGeneratorImag&& generate_imag) +{ + zfloatv retval; + real(retval) = floatv(generate_real); + imag(retval) = floatv(generate_imag); + return retval; +} + +static inline auto load(std::span p) +{ + const auto generate_real = [&](size_t i) { + return p[i].real(); + }; + const auto generate_imag = [&](size_t i) { + return p[i].imag(); + }; + return make_zfloatv(generate_real, generate_imag); +} + + +// https://en.cppreference.com/w/cpp/numeric/complex/arg +// > `std::atan2(std::imag(z), std::real(z))` +inline auto arg(const floatv& real, const floatv& imag) +{ + return atan2(imag, real); // arg() +} +inline auto arg(const zfloatv& z) +{ + return arg(real(z), imag(z)); +} + +inline auto roundi(const floatv& v) // match vcl::roundi() +{ + return static_simd_cast(round(v)); +} + +template +inline auto select(const TTest& test_, const TResult& t, const TResult& f) +{ + //const auto test = test_.__cvt(); // https://github.com/VcDevel/std-simd/issues/41 + const auto test = stdx::static_simd_cast(test_); // https://github.com/VcDevel/std-simd/issues/41 + + // https://en.cppreference.com/w/cpp/experimental/simd/where_expression + // > ... All other elements are left unchanged. + TResult retval; + where(test, retval) = t; + where(!test, retval) = f; + return retval; +} + +static inline auto getPhase(const zfloatv& v, float phase_delta) +{ + // Phase is determined via arithmetic because it's equally spaced. + // There's an intentional conversion to zero when we cast 256 -> uint8. That wrap around + // handles cases that are close to 2PI. + auto phase = arg(v); + where(phase < 0.0f, phase) += std::numbers::pi_v *2.0f; // Wrap from [0, 2PI] + return roundi(phase / phase_delta); +} + +template +static inline auto lookup(const intv& zindex, const std::array& phase_directions) +{ + // It seems that the "generator" constuctor is called with SIMD instructions. + // https://en.cppreference.com/w/cpp/experimental/simd/simd/simd + // > The calls to `generator` are unsequenced with respect to each other. + + const auto generate_real = [&](size_t i) { + const auto i_ = zindex[i]; + return phase_directions[i_].real(); + }; + const auto generate_imag = [&](size_t i) { + const auto i_ = zindex[i]; + return phase_directions[i_].imag(); + }; + return make_zfloatv(generate_real, generate_imag); +} + +// https://en.cppreference.com/w/cpp/algorithm/lower_bound +/* +template +ForwardIt lower_bound(ForwardIt first, ForwardIt last, const T& value) +{ + ForwardIt it; + typename std::iterator_traits::difference_type count, step; + count = std::distance(first, last); + + while (count > 0) + { + it = first; + step = count / 2; + std::advance(it, step); + + if (*it < value) + { + first = ++it; + count -= step + 1; + } + else + count = step; + } + + return first; +} +*/ +template +static inline auto lookup(const intv& zindex, std::span magnitudes) +{ + // It seems that the "generator" constuctor is called with SIMD instructions. + // https://en.cppreference.com/w/cpp/experimental/simd/simd/simd + // > The calls to `generator` are unsequenced with respect to each other. + + const auto generate = [&](size_t i) { + const auto i_ = zindex[i]; + return magnitudes[i_]; + }; + return floatv(generate); +} +inline auto lower_bound_(std::span magnitudes, const floatv& v) +{ + intv first = 0; + const intv last = gsl::narrow(magnitudes.size()); + + auto count = last - first; + while (any_of(count > 0)) + { + auto it = first; + const auto step = count / 2; + it += step; + + auto next = it; ++next; // ... ++it; + auto advance = count; advance -= step + 1; // ... -= step + 1; + + const auto c = lookup(it, magnitudes); // magnituides[it] + + const auto test = c < v; // (c < v).__cvt(); // https://github.com/VcDevel/std-simd/issues/41 + + //where(test, it) = next; // ... ++it + //where(test, first) = it; // first = ... + //// count -= step + 1 <...OR...> count = step + //where(test, count) = advance; + //where(!test, count) = step; + it = select(test, next, it); // ... ++it + first = select(test, it, first); // first = ... + count = select(test, advance, step); // count -= step + 1 <...OR...> count = step + } + return first; +} +inline auto lower_bound(std::span magnitudes, const floatv& value) +{ + auto retval = lower_bound_(magnitudes, value); + + #ifndef NDEBUG // i.e., debug + for (size_t i = 0; i < value.size(); i++) + { + const auto it = std::lower_bound(magnitudes.begin(), magnitudes.end(), value[i]); + const auto result = gsl::narrow(std::distance(magnitudes.begin(), it)); + assert(retval[i] == result); + } + #endif + + return retval; +} + +static auto nearest(std::span magnitudes, const floatv& value) +{ + assert(magnitudes.size() == six::AmplitudeTableSize); + + /* + const auto it = std::lower_bound(begin, end, value); + if (it == begin) return 0; + + const auto prev_it = std::prev(it); + const auto nearest_it = it == end ? prev_it : + (value - *prev_it <= *it - value ? prev_it : it); + const auto distance = std::distance(begin, nearest_it); + assert(distance <= std::numeric_limits::max()); + return gsl::narrow(distance); + */ + const auto it = ::lower_bound(magnitudes, value); + const auto prev_it = it - 1; // const auto prev_it = std::prev(it); + + const auto v0 = value - lookup(prev_it, magnitudes); // value - *prev_it + const auto v1 = lookup(it, magnitudes) - value; // *it - value + //const auto nearest_it = select(v0 <= v1, prev_it, it); // (value - *prev_it <= *it - value ? prev_it : it); + + const intv end = gsl::narrow(magnitudes.size()); + //const auto end_test = select(it == end, prev_it, nearest_it); // it == end ? prev_it : ... + const intv zero = 0; + auto retval = select(it == 0, zero, // if (it == begin) return 0; + select(it == end, prev_it, // it == end ? prev_it : ... + select(v0 <=v1, prev_it, it) // (value - *prev_it <= *it - value ? prev_it : it); + )); + return retval; +} + +static auto find_nearest(std::span magnitudes, const floatv& phase_direction_real, const floatv& phase_direction_imag, + const zfloatv& v) +{ + // We have to do a 1D nearest neighbor search for magnitude. + // But it's not the magnitude of the input complex value - it's the projection of + // the complex value onto the ray of candidate magnitudes at the selected phase. + // i.e. dot product. + const auto projection = (phase_direction_real * real(v)) + (phase_direction_imag * imag(v)); + //assert(std::abs(projection - std::abs(v)) < 1e-5); // TODO ??? + return nearest(magnitudes, projection); +} +static inline auto find_nearest(std::span magnitudes, const zfloatv& phase_direction, const zfloatv& v) +{ + return find_nearest(magnitudes, real(phase_direction), imag(phase_direction), v); +} + +void six::sicd::details::ComplexToAMP8IPHS8I::Impl::nearest_neighbors_unseq_(std::span p, std::span results) const +{ + const auto v = load(p); + + const auto phase = ::getPhase(v, phase_delta); + + const auto phase_direction = lookup(phase, phase_directions); + #ifndef NDEBUG // i.e., debug + for (size_t i = 0; i < phase.size(); i++) + { + const auto pd = phase_directions[phase[i]]; + assert(pd.real() == real(phase_direction)[i]); + assert(pd.imag() == imag(phase_direction)[i]); + } + #endif + + const auto amplitude = ::find_nearest(magnitudes, phase_direction, v); + #ifndef NDEBUG // i.e., debug + for (size_t i = 0; i < amplitude.size(); i++) + { + const auto i_ = phase[i]; + const auto a = find_nearest(phase_directions[i_], p[i]); + assert(a == amplitude[i]); + } + #endif + + auto dest = results.begin(); + for (size_t i = 0; i < v.size(); i++) + { + dest->phase = gsl::narrow_cast(phase[i]); + dest->amplitude = gsl::narrow_cast(amplitude[i]); + + ++dest; + } +} + +void six::sicd::details::ComplexToAMP8IPHS8I::Impl::nearest_neighbors_unseq(std::span inputs, std::span results) const +{ + auto first = inputs.begin(); + const auto last = inputs.end(); + auto dest = results.begin(); + + // The above code is simpler (no templates) if we use just a single VCL + // complex type: `zfloatv`. If there is any performance difference, + // it will only be for extreme edge cases since the smaller types are only used + // at the end of the loop. + // + // It also makes this loop simpler as we handle all non-multiples-of-8 in + // the same way. + constexpr auto elements_per_iteration = 8; + + // Can do these checks one-time outside of the loop + const auto distance = std::distance(first, last); + + // First, do multiples of 8 + const auto distance_ = distance - (distance % elements_per_iteration); + const auto last_ = first + distance_; + for (; first != last_; first += elements_per_iteration, dest += elements_per_iteration) + { + const auto f = sys::make_span(&(*first), elements_per_iteration); + const auto d = sys::make_span(&(*dest), elements_per_iteration); + nearest_neighbors_unseq_(f, d); + } + + // Then finish off anything left + assert(std::distance(first, last) < elements_per_iteration); + for (; first != last; ++first, ++dest) + { + const auto f = sys::make_span(&(*first), 1); + const auto d = sys::make_span(&(*dest), 1); + nearest_neighbors_seq(f, d); + } +} +std::vector six::sicd::details::ComplexToAMP8IPHS8I::nearest_neighbors_unseq_vcl( + std::span inputs, const six::AmplitudeTable* pAmplitudeTable) +{ + // make a structure to quickly find the nearest neighbor + const auto& converter = make_(pAmplitudeTable); + + std::vector retval(inputs.size()); + converter.impl.nearest_neighbors_unseq(inputs, sys::make_span(retval)); + return retval; +} + +#endif // SIX_sicd_has_simd diff --git a/six/modules/c++/six.sicd/source/ComplexToAMP8IPHS8I_unseq.cpp b/six/modules/c++/six.sicd/source/ComplexToAMP8IPHS8I_unseq.cpp new file mode 100644 index 0000000000..7de006531a --- /dev/null +++ b/six/modules/c++/six.sicd/source/ComplexToAMP8IPHS8I_unseq.cpp @@ -0,0 +1,756 @@ +/* ========================================================================= +* This file is part of six.sicd-c++ +* ========================================================================= +* +* (C) Copyright 2021, Maxar Technologies, Inc. +* +* six.sicd-c++ is free software; you can redistribute it and/or modify +* it under the terms of the GNU Lesser General Public License as published by +* the Free Software Foundation; either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this program; If not, +* see . +* +*/ +#include "six/AmplitudeTable.h" + +#include +#include + +#include +#include +#include +#include +#include +#include + +#include +#if CODA_OSS_cpp17 + // is broken with the older version of GCC we're using + #if (__GNUC__ >= 10) || _MSC_VER + #include + #define SIX_six_sicd_ComplexToAMP8IPHS8I_has_execution 1 + #endif +#endif + +#include +#include +#include +#include + +#include "six/sicd/Utilities.h" + +#undef min +#undef max + +using zfloat = six::zfloat; + +#if SIX_sicd_has_VCL + +#define VCL_NAMESPACE vcl +#if _MSC_VER +#pragma warning(push) +#pragma warning(disable: 4100) // '...': unreferenced formal parameter +#pragma warning(disable: 4127) // conditional expression is constant +#pragma warning(disable: 4244) // '...': conversion from '...' to '...', possible loss of data +#pragma warning(disable: 4723) // potential divide by 0 +#endif +#include "six/sicd/vectorclass/version2/vectorclass.h" +#include "six/sicd/vectorclass/version2/vectormath_trig.h" +#include "six/sicd/vectorclass/complex/complexvec1.h" +#if _MSC_VER +#pragma warning(pop) +#endif + +namespace six +{ +namespace sicd +{ +namespace vcl +{ + +constexpr auto elements_per_iteration = 4; + +using floatv = ::vcl::Vec4f; +using intv = ::vcl::Vec4i; +using zfloatv = ::vcl::Complex4f; + +} // vcl +} // sicd +} // six + +auto real(const six::sicd::vcl::zfloatv& z) +{ + return z.real(); +} +auto imag(const six::sicd::vcl::zfloatv& z) +{ + return z.imag(); +} +static inline size_t size(const six::sicd::vcl::zfloatv& z) noexcept +{ + return z.size(); +} +static inline int ssize(const six::sicd::vcl::zfloatv& z) noexcept +{ + return z.size(); +} +static inline int ssize(const six::sicd::vcl::floatv& z) noexcept +{ + return z.size(); +} +static inline int ssize(const six::sicd::vcl::intv& z) noexcept +{ + return z.size(); +} + +// https://en.cppreference.com/w/cpp/numeric/complex/arg +// > `std::atan2(std::imag(z), std::real(z))` +inline auto arg(const six::sicd::vcl::floatv& real, const six::sicd::vcl::floatv& imag) +{ + return atan2(imag, real); // arg() +} +inline auto arg(const six::sicd::vcl::zfloatv& z) +{ + return arg(real(z), imag(z)); +} + +template +inline auto if_add(const T& f, const six::sicd::vcl::floatv& a, float b) +{ + return vcl::if_add(f, a, b); +} + +inline bool any_of(const six::sicd::vcl::intv& m) +{ + return horizontal_or(m); +} + +static inline void copy_from(std::span p, six::sicd::vcl::floatv& result) +{ + assert(p.size() == result.size()); + result.load(p.data()); +} +static inline auto copy_from(std::span p, six::sicd::vcl::zfloatv& result) +{ + // https://en.cppreference.com/w/cpp/numeric/complex + // > For any pointer to an element of an array of `std::complex` named `p` and any valid array index `i`, ... + // > is the real part of the complex number `p[i]`, ... + result.load(reinterpret_cast(p.data())); +} + +template +static inline auto lookup(const six::sicd::vcl::intv& zindex, const std::array& phase_directions) +{ + return ::vcl::lookup(zindex, phase_directions.data()); +} +static inline auto lookup(const six::sicd::vcl::intv& zindex, std::span magnitudes) +{ + assert(magnitudes.size() == six::AmplitudeTableSize); + return ::vcl::lookup(zindex, magnitudes.data()); +} + +#endif // SIX_sicd_has_VCL + +#if SIX_sicd_has_ximd +#ifndef CODA_OSS_Ximd_ENABLE +#define CODA_OSS_Ximd_ENABLE 1 +#endif +#include + +namespace six +{ +namespace sicd +{ +namespace ximd +{ + +template +using simd = sys::ximd::Ximd; +using intv = simd; +using floatv = simd; +using intv_mask = sys::ximd::ximd_mask; +using floatv_mask = sys::ximd::ximd_mask; + +constexpr auto elements_per_iteration = floatv::size(); + +// Manage a SIMD complex as an array of two SIMDs +using zfloatv = std::array; + +template +static inline auto select(const TTest& test, const TResult& t, const TResult& f) +{ + TResult retval; + for (size_t i = 0; i < test.size(); i++) + { + retval[i] = test[i] ? t[i] : f[i]; + } + return retval; +} + +} // ximd +} // sicd +} // six + +static inline auto& real(six::sicd::ximd::zfloatv& z) noexcept +{ + return z[0]; +} +static inline const auto& real(const six::sicd::ximd::zfloatv& z) noexcept +{ + return z[0]; +} +static inline auto& imag(six::sicd::ximd::zfloatv& z) noexcept +{ + return z[1]; +} +static inline const auto& imag(const six::sicd::ximd::zfloatv& z) noexcept +{ + return z[1]; +} + +static inline size_t size(const six::sicd::ximd::zfloatv& z) noexcept +{ + auto retval = real(z).size(); + assert(retval == imag(z).size()); + return retval; +} +static inline auto ssize(const six::sicd::ximd::zfloatv& z) noexcept +{ + return gsl::narrow(size(z)); +} +template +static inline auto ssize(const six::sicd::ximd::simd& v) noexcept +{ + return gsl::narrow(v.size()); +} + +namespace six +{ +namespace sicd +{ +namespace ximd +{ + +template +static inline auto make_zfloatv(TGeneratorReal&& generate_real, TGeneratorImag&& generate_imag) +{ + six::sicd::ximd::zfloatv retval; + for (size_t i = 0; i < size(retval); i++) + { + real(retval)[i] = generate_real(i); + imag(retval)[i] = generate_imag(i); + } + return retval; +} + +} // ximd +} // sicd +} // six + + +static inline auto arg(const six::sicd::ximd::zfloatv& z) +{ + // https://en.cppreference.com/w/cpp/numeric/complex/arg + // > `std::atan2(std::imag(z), std::real(z))` + return atan2(imag(z), real(z)); // arg() +} + +static inline auto copy_from(std::span p, six::sicd::ximd::floatv& result) +{ + assert(p.size() == result.size()); + result.copy_from(p.data()); +} +static inline auto copy_from(std::span p, six::sicd::ximd::zfloatv& result) +{ + const auto generate_real = [&](size_t i) { return p[i].real(); }; + const auto generate_imag = [&](size_t i) { return p[i].imag(); }; + result = six::sicd::ximd::make_zfloatv(generate_real, generate_imag); +} + +static inline auto roundi(const six::sicd::ximd::floatv& v) // match vcl::roundi() +{ + const auto rounded = round(v); + const auto generate_roundi = [&](size_t i) + { return static_cast(rounded[i]); }; + return six::sicd::ximd::intv::generate(generate_roundi); +} + +static inline auto select(const six::sicd::ximd::floatv_mask& test, const six::sicd::ximd::floatv& t, const six::sicd::ximd::floatv& f) +{ + return six::sicd::ximd::select(test, t, f); +} +static inline auto select(const six::sicd::ximd::intv_mask& test, const six::sicd::ximd::intv& t, const six::sicd::ximd::intv& f) +{ + return six::sicd::ximd::select(test, t, f); +} + +static inline auto if_add(const six::sicd::ximd::floatv_mask& m, const six::sicd::ximd::floatv& v, typename six::sicd::ximd::floatv::value_type c) +{ + // phase = if_add(phase < 0.0, phase, std::numbers::pi_v * 2.0f); // Wrap from [0, 2PI] + const auto generate_add = [&](size_t i) { + return m[i] ? v[i] + c : v[i]; + }; + return six::sicd::ximd::floatv::generate(generate_add); +} + +template +static inline auto lookup(const six::sicd::ximd::intv& zindex, const std::array& phase_directions) +{ + // It seems that the "generator" constuctor is called with SIMD instructions. + // https://en.cppreference.com/w/cpp/experimental/simd/simd/simd + // > The calls to `generator` are unsequenced with respect to each other. + + const auto generate_real = [&](size_t i) { + const auto i_ = zindex[i]; + return phase_directions[i_].real(); + }; + const auto generate_imag = [&](size_t i) { + const auto i_ = zindex[i]; + return phase_directions[i_].imag(); + }; + return six::sicd::ximd::make_zfloatv(generate_real, generate_imag); +} + +static auto lookup(const six::sicd::ximd::intv& zindex, std::span magnitudes) +{ + const auto generate = [&](size_t i) { + const auto i_ = zindex[i]; + + // The index may be out of range. This is expected because `i` might be "don't care." + if ((i_ >= 0) && (i_ < std::ssize(magnitudes))) + { + return magnitudes[i_]; + } + return NAN; // propogate "don't care" + }; + return six::sicd::ximd::floatv::generate(generate); +} + +#endif // SIX_sicd_has_ximd + +template +static auto getPhase(const ZFloatV& v, float phase_delta) +{ + // Phase is determined via arithmetic because it's equally spaced. + // There's an intentional conversion to zero when we cast 256 -> uint8. That wrap around + // handles cases that are close to 2PI. + auto phase = arg(v); + phase = if_add(phase < 0.0, phase, std::numbers::pi_v * 2.0f); // Wrap from [0, 2PI] + return roundi(phase / phase_delta); +} + +// https://en.cppreference.com/w/cpp/algorithm/lower_bound +/* +template +ForwardIt lower_bound(ForwardIt first, ForwardIt last, const T& value) +{ + ForwardIt it; + typename std::iterator_traits::difference_type count, step; + count = std::distance(first, last); + + while (count > 0) + { + it = first; + step = count / 2; + std::advance(it, step); + + if (*it < value) + { + first = ++it; + count -= step + 1; + } + else + count = step; + } + + return first; +} +*/ +template +inline auto lower_bound_(std::span magnitudes, const FloatV& v) +{ + IntV first = 0; + const IntV last = gsl::narrow(magnitudes.size()); + + auto count = last - first; + while (any_of(count > 0)) + { + auto it = first; + const auto step = count / 2; + it += step; + + auto next = it; ++next; // ... ++it; + auto advance = count; advance -= step + 1; // ... -= step + 1; + + const auto c = lookup(it, magnitudes); // magnituides[it] + const auto test = c < v; + it = select(test, next, it); // ... ++it + first = select(test, it, first); // first = ... + count = select(test, advance, step); // count -= step + 1 <...OR...> count = step + } + return first; +} +template +inline auto lower_bound(std::span magnitudes, const FloatV& value) +{ + auto retval = lower_bound_(magnitudes, value); + + #if CODA_OSS_DEBUG + for (int i = 0; i < ssize(value); i++) + { + const auto it = std::lower_bound(magnitudes.begin(), magnitudes.end(), value[i]); + const auto result = gsl::narrow(std::distance(magnitudes.begin(), it)); + assert(retval[i] == result); + } + #endif + + return retval; +} + +template +static auto nearest(std::span magnitudes, const FloatV& value) +{ + assert(magnitudes.size() == six::AmplitudeTableSize); + + /* + const auto it = std::lower_bound(begin, end, value); + if (it == begin) return 0; + + const auto prev_it = std::prev(it); + const auto nearest_it = it == end ? prev_it : + (value - *prev_it <= *it - value ? prev_it : it); + const auto distance = std::distance(begin, nearest_it); + assert(distance <= std::numeric_limits::max()); + return gsl::narrow(distance); + */ + const auto it = ::lower_bound(magnitudes, value); + const auto prev_it = it - 1; // const auto prev_it = std::prev(it); + + const auto v0 = value - lookup(prev_it, magnitudes); // value - *prev_it + const auto v1 = lookup(it, magnitudes) - value; // *it - value + //const auto nearest_it = select(v0 <= v1, prev_it, it); // (value - *prev_it <= *it - value ? prev_it : it); + + const IntV end = gsl::narrow(magnitudes.size()); + //const auto end_test = select(it == end, prev_it, nearest_it); // it == end ? prev_it : ... + const IntV zero = 0; + auto retval = select(it == 0, zero, // if (it == begin) return 0; + select(it == end, prev_it, // it == end ? prev_it : ... + select(v0 <=v1, prev_it, it) // (value - *prev_it <= *it - value ? prev_it : it); + )); + return retval; +} + +template +static auto find_nearest(std::span magnitudes, + const FloatV& phase_direction_real, const FloatV& phase_direction_imag, + const ZFloatV& v) +{ + // We have to do a 1D nearest neighbor search for magnitude. + // But it's not the magnitude of the input complex value - it's the projection of + // the complex value onto the ray of candidate magnitudes at the selected phase. + // i.e. dot product. + const auto projection = (phase_direction_real * real(v)) + (phase_direction_imag * imag(v)); + //assert(std::abs(projection - std::abs(v)) < 1e-5); // TODO ??? + return nearest(magnitudes, projection); +} + +#if SIX_sicd_has_VCL +static auto lookup_and_find_nearest(const six::sicd::details::ComplexToAMP8IPHS8I& converter, + const six::sicd::vcl::intv& phase, const six::sicd::vcl::zfloatv& v) +{ + const auto& impl = converter.impl; + + const auto phase_direction_real = lookup(phase, impl.phase_directions_real); + const auto phase_direction_imag = lookup(phase, impl.phase_directions_imag); + return ::find_nearest(impl.magnitudes, phase_direction_real, phase_direction_imag, v); +} +#endif + +#if SIX_sicd_has_ximd +static auto lookup_and_find_nearest(const six::sicd::details::ComplexToAMP8IPHS8I& converter, + const six::sicd::ximd::intv& phase, const six::sicd::ximd::zfloatv& v) +{ + const auto& impl = converter.impl; + + const auto phase_direction = lookup(phase, impl.phase_directions); + return ::find_nearest(impl.magnitudes, real(phase_direction), imag(phase_direction), v); +} +#endif + +template +void six::sicd::details::ComplexToAMP8IPHS8I::Impl::nearest_neighbors_unseq_T(std::span p, std::span results) const +{ + ZFloatV v; + assert(p.size() == size(v)); + + copy_from(p, v); + #if CODA_OSS_DEBUG + for (int i = 0; i < ssize(v); i++) + { + const auto z = p[i]; + assert(real(v)[i] == z.real()); + assert(imag(v)[i] == z.imag()); + } + #endif + + const auto phase = ::getPhase(v, phase_delta); + #if CODA_OSS_DEBUG + for (int i = 0; i < ssize(phase); i++) + { + const auto phase_ = getPhase(p[i]); + assert(static_cast(phase[i]) == phase_); + } + #endif + + const auto amplitude = lookup_and_find_nearest(converter, phase, v); + #if CODA_OSS_DEBUG + for (int i = 0; i < ssize(amplitude); i++) + { + const auto i_ = phase[i]; + const auto a = find_nearest(phase_directions[i_], p[i]); + assert(a == amplitude[i]); + } + #endif + + // interleave() and store() is slower than an explicit loop. + auto dest = results.begin(); + for (int i = 0; i < ssize(v); i++) + { + dest->phase = gsl::narrow_cast(phase[i]); + dest->amplitude = gsl::narrow_cast(amplitude[i]); + + ++dest; + } +} + +template +void six::sicd::details::ComplexToAMP8IPHS8I::Impl::nearest_neighbors_unseq(std::span inputs, std::span results) const +{ + auto first = inputs.begin(); + const auto last = inputs.end(); + auto dest = results.begin(); + + // The above code is simpler (no templates) if we use just a single VCL + // complex type: `zfloatv`. If there is any performance difference, + // it will only be for extreme edge cases since the smaller types are only used + // at the end of the loop. + // + // It also makes this loop simpler as we handle all non-multiples-of-8 in + // the same way. + + // Can do these checks one-time outside of the loop + const auto distance = std::distance(first, last); + + // First, do multiples of 8 + const auto distance_ = distance - (distance % elements_per_iteration); + const auto last_ = first + distance_; + for (; first != last_; first += elements_per_iteration, dest += elements_per_iteration) + { + const auto f = sys::make_span(&(*first), elements_per_iteration); + const auto d = sys::make_span(&(*dest), elements_per_iteration); + + nearest_neighbors_unseq_T(f, d); + } + + // Then finish off anything left + assert(std::distance(first, last) < elements_per_iteration); + for (; first != last; ++first, ++dest) + { + const auto f = sys::make_span(&(*first), 1); + const auto d = sys::make_span(&(*dest), 1); + nearest_neighbors_seq(f, d); + } +} + +#if SIX_sicd_has_VCL +std::vector six::sicd::details::ComplexToAMP8IPHS8I::nearest_neighbors_unseq_vcl( + std::span inputs, const six::AmplitudeTable* pAmplitudeTable) +{ + // make a structure to quickly find the nearest neighbor + const auto& converter = make_(pAmplitudeTable); + + std::vector retval(inputs.size()); + converter.impl.nearest_neighbors_unseq(inputs, sys::make_span(retval)); + return retval; +} +#endif // SIX_sicd_has_VCL + +#if SIX_sicd_has_ximd +std::vector six::sicd::details::ComplexToAMP8IPHS8I::nearest_neighbors_unseq_ximd( + std::span inputs, const six::AmplitudeTable* pAmplitudeTable) +{ + // make a structure to quickly find the nearest neighbor + const auto& converter = make_(pAmplitudeTable); + + std::vector retval(inputs.size()); + converter.impl.nearest_neighbors_unseq(inputs, sys::make_span(retval)); + return retval; +} +#endif // SIX_sicd_has_ximd + +/********************************************************************** + +// This is here (instead of **ComplexToAMP8IPHS8I.cpp**) because par_unseq() might +// need to know implementation details of _unseq() +using input_it = std::span::iterator; +using output_it = std::span::iterator; + +struct const_iterator final +{ + using Type = input_it::value_type; + + using iterator_category = std::random_access_iterator_tag; + using value_type = std::remove_cv_t; + using difference_type = std::ptrdiff_t; + using pointer = Type*; + using reference = Type&; + using const_reference = const Type&; + + input_it current_; + + const_iterator() = default; + const_iterator(input_it it) : current_(it) {} + + const_reference operator*() const noexcept + { + return *current_; + } + + const_iterator& operator++() noexcept + { + for (ptrdiff_t i = 0; i < 8; i++) + { + ++current_; + } + return *this; + } + + const_iterator& operator--() noexcept + { + --current_; + return *this; + } + + const_iterator& operator-=(const difference_type n) noexcept + { + current_ -= n; + return *this; + } + const_iterator operator-(const difference_type n) const noexcept + { + auto ret = *this; + ret -= n; + return ret; + } + difference_type operator-(const const_iterator& rhs) const noexcept + { + return current_ - rhs.current_; + } + + bool operator!=(const const_iterator& rhs) const noexcept + { + return current_ != rhs.current_; + } +}; + +struct result_wrapper final +{ + output_it current_; + + result_wrapper& operator=(const std::vector& values) + { + for (auto& v : values) + { + *current_ = v; + ++current_; + } + return *this; + } +}; + +struct iterator final +{ + using Type = output_it::value_type; + + using iterator_category = std::random_access_iterator_tag; + using value_type = std::remove_cv_t; + using difference_type = std::ptrdiff_t; + using pointer = Type*; + using reference = Type&; + + output_it current_; + + iterator() = default; + iterator(output_it it) : current_(it) {} + + result_wrapper operator*() noexcept + { + return result_wrapper{ current_}; + } + + iterator& operator++() noexcept + { + for (ptrdiff_t i = 0; i < 8; i++) + { + ++current_; + } + return *this; + } + + iterator& operator--() noexcept + { + --current_; + return *this; + } + + iterator& operator-=(const difference_type n) noexcept + { + current_ -= n; + return *this; + } + + bool operator!=(const iterator& rhs) const noexcept + { + return current_ != rhs.current_; + } +}; + +void six::sicd::details::ComplexToAMP8IPHS8I::Impl::nearest_neighbors_par_unseq(std::span inputs, std::span results) const +{ + const auto first = inputs.begin(); + const auto last = inputs.end(); + auto dest = results.begin(); + + const auto func = [&](const auto& v) { + std::span values(&v, 8); + + std::vector retval(values.size()); + nearest_neighbors_unseq(values, sys::make_span(retval)); + return retval; + }; + + std::ignore = std::transform(std::execution::seq, + const_iterator{ first }, const_iterator{ last }, iterator{ dest }, func); +} +#if SIX_sicd_ComplexToAMP8IPHS8I_unseq +std::vector six::sicd::details::ComplexToAMP8IPHS8I::nearest_neighbors_par_unseq( + std::span inputs, const six::AmplitudeTable* pAmplitudeTable) +{ + // make a structure to quickly find the nearest neighbor + const auto& converter = make_(pAmplitudeTable); + + std::vector retval(inputs.size()); + converter.impl.nearest_neighbors_par_unseq(inputs, sys::make_span(retval)); + return retval; +} +#endif // SIX_sicd_ComplexToAMP8IPHS8I_unseq + +**********************************************************************/ diff --git a/six/modules/c++/six.sicd/source/ComplexToAMP8IPHS8I_vcl.cpp b/six/modules/c++/six.sicd/source/ComplexToAMP8IPHS8I_vcl.cpp deleted file mode 100644 index 74fa232253..0000000000 --- a/six/modules/c++/six.sicd/source/ComplexToAMP8IPHS8I_vcl.cpp +++ /dev/null @@ -1,239 +0,0 @@ -/* ========================================================================= -* This file is part of six.sicd-c++ -* ========================================================================= -* -* (C) Copyright 2021, Maxar Technologies, Inc. -* -* six.sicd-c++ is free software; you can redistribute it and/or modify -* it under the terms of the GNU Lesser General Public License as published by -* the Free Software Foundation; either version 3 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this program; If not, -* see . -* -*/ -#include "six/AmplitudeTable.h" - -#include -#include - -#include -#include -#include -#include -#include - -#include -#include -#include - -#include "six/sicd/Utilities.h" - -#undef min -#undef max - -#if SIX_sicd_has_VCL - -#define VCL_NAMESPACE vcl -#if _MSC_VER -#pragma warning(disable: 4100) // '...': unreferenced formal parameter -#endif -#include "six/sicd/vectorclass/version2/vectorclass.h" -#include "six/sicd/vectorclass/version2/vectormath_trig.h" -#include "six/sicd/vectorclass/complex/complexvec1.h" - -// https://en.cppreference.com/w/cpp/experimental/simd -using zfloatv = vcl::Complex8f; -using floatv = vcl::Vec8f; -using intv = vcl::Vec8i; - -// https://en.cppreference.com/w/cpp/numeric/complex/arg -// > `std::atan2(std::imag(z), std::real(z))` -inline auto arg(const floatv& real, const floatv& imag) -{ - return atan2(imag, real); // arg() -} -inline auto arg(const zfloatv& z) -{ - return arg(z.real(), z.imag()); -} - -static inline auto interleave(const intv& a, const intv& b) -{ - // The blend() indicies are based on one large array - auto index0 = vcl::blend8<0, 8, 1, 9, 2, 10, 3, 11>(a, b); // i.e., a[0], b[0], a[1], b[1], ... - auto index1 = vcl::blend8<4, 12, 5, 13, 6, 14, 7, 15>(a, b); - return vcl::Vec16i(std::move(index0), std::move(index1)); -} - -// There's no `vcl::lookup()` for `std::complex*`, implement using floats -template -static auto lookup(const intv& zindex, const std::array& table_) -{ - const auto table = reinterpret_cast(table_.data()); - constexpr auto size_as_floats = N * 2; // table_t is six::zfloat - - // A `six::zfloat` at *n* is at *2n* when viewed as `float`. - const auto real_index = zindex * 2; - // The imaginary part is after the real part - const auto imag_index = real_index + 1; // [n] is real, [n+1] is imag - const auto index = interleave(real_index, imag_index); - - auto lookup = vcl::lookup(index, table); - return zfloatv(std::move(lookup)); -} - -static auto getPhase(const zfloatv& v, float phase_delta) -{ - // Phase is determined via arithmetic because it's equally spaced. - // There's an intentional conversion to zero when we cast 256 -> uint8. That wrap around - // handles cases that are close to 2PI. - auto phase = arg(v); - phase = if_add(phase < 0.0, phase, std::numbers::pi_v * 2.0f); // Wrap from [0, 2PI] - return roundi(phase / phase_delta); -} - -inline auto lower_bound(std::span magnitudes, const floatv& value) -{ - const auto begin = magnitudes.begin(); - const auto end = magnitudes.end(); - - intv retval; - for (int i = 0; i < value.size(); i++) - { - const auto it = std::lower_bound(begin, end, value[i]); - const auto result = std::distance(begin, it); - retval.insert(i, gsl::narrow(result)); - } - return retval; -} -static auto nearest(std::span magnitudes, const floatv& value) -{ - assert(magnitudes.size() == six::AmplitudeTableSize); - - /* - const auto it = std::lower_bound(begin, end, value); - if (it == begin) return 0; - - const auto prev_it = std::prev(it); - const auto nearest_it = it == end ? prev_it : - (value - *prev_it <= *it - value ? prev_it : it); - const auto distance = std::distance(begin, nearest_it); - assert(distance <= std::numeric_limits::max()); - return gsl::narrow(distance); - */ - const auto it = ::lower_bound(magnitudes, value); - const auto prev_it = it - 1; // const auto prev_it = std::prev(it); - - const auto v0 = value - vcl::lookup(prev_it, magnitudes.data()); // value - *prev_it - const auto v1 = vcl::lookup(it, magnitudes.data()) - value; // *it - value - //const auto nearest_it = select(v0 <= v1, prev_it, it); // (value - *prev_it <= *it - value ? prev_it : it); - - const intv end = gsl::narrow(magnitudes.size()); - //const auto end_test = select(it == end, prev_it, nearest_it); // it == end ? prev_it : ... - const intv zero = 0; - auto retval = select(it == 0, zero, // if (it == begin) return 0; - select(it == end, prev_it, // it == end ? prev_it : ... - select(v0 <=v1, prev_it, it) // (value - *prev_it <= *it - value ? prev_it : it); - )); - return retval; -} - -static inline auto find_nearest(std::span magnitudes, const zfloatv& phase_direction, const zfloatv& v) -{ - // We have to do a 1D nearest neighbor search for magnitude. - // But it's not the magnitude of the input complex value - it's the projection of - // the complex value onto the ray of candidate magnitudes at the selected phase. - // i.e. dot product. - const auto projection = (phase_direction.real() * v.real()) + (phase_direction.imag() * v.imag()); - //assert(std::abs(projection - std::abs(v)) < 1e-5); // TODO ??? - return nearest(magnitudes, projection); -} -static inline auto find_nearest(std::span magnitudes, const floatv& phase_direction_real, const floatv& phase_direction_imag, - const zfloatv& v) -{ - // We have to do a 1D nearest neighbor search for magnitude. - // But it's not the magnitude of the input complex value - it's the projection of - // the complex value onto the ray of candidate magnitudes at the selected phase. - // i.e. dot product. - const auto projection = (phase_direction_real * v.real()) + (phase_direction_imag * v.imag()); - //assert(std::abs(projection - std::abs(v)) < 1e-5); // TODO ??? - return nearest(magnitudes, projection); -} - -template< typename TOutputIter> -void six::sicd::details::ComplexToAMP8IPHS8I::nearest_neighbors_unseq_(const six::zfloat* p, TOutputIter dest) const -{ - // https://en.cppreference.com/w/cpp/numeric/complex - // > For any pointer to an element of an array of `std::complex` named `p` and any valid array index `i`, ... - // > is the real part of the complex number `p[i]`, ... - zfloatv v; - v.load(reinterpret_cast(p)); - - const auto phase = ::getPhase(v, phase_delta); - - //const auto phase_direction = lookup(phase, phase_directions); - //const auto amplitude = ::find_nearest(magnitudes, phase_direction, v); - const auto phase_direction_real = vcl::lookup(phase, phase_directions_real.data()); - const auto phase_direction_imag = vcl::lookup(phase, phase_directions_imag.data()); - //const auto amplitude = ::find_nearest(magnitudes, phase_direction_real, phase_direction_imag, v); - - // interleave() and store() is slower than an explicit loop. - for (int i = 0; i < v.size(); i++) - { - dest->phase = gsl::narrow_cast(phase[i]); - - //dest->amplitude = find_nearest(phase_directions[dest->phase], p[i]); - //const auto phase_direction_ = phase_direction.extract(i); - //dest->amplitude = find_nearest(six::zfloat(phase_direction_.real(), phase_direction_.imag()), p[i]); - dest->amplitude = find_nearest(six::zfloat(phase_direction_real[i], phase_direction_imag[i]), p[i]); - //dest->amplitude = gsl::narrow_cast(amplitude[i]); - - ++dest; - } -} - -template -void six::sicd::details::ComplexToAMP8IPHS8I::nearest_neighbors_unseq(TInputIt first, TInputIt last, TOutputIt dest) const -{ - // The above code is simpler (no templates) if we use just a single VCL - // complex type: `zfloatv`. If there is any performance differ4ence, - // it will only be for extreme edge cases since the smaller types are only used - // at the end of the loop. - // - // It also makes this loop simpler as we handle all non-multiples-of-8 in - // the same way. - for (; first != last; ++first, ++dest) - { - const auto distance = std::distance(first, last); - assert(distance > 0); // should be out of the loop! - if (distance % 8 == 0) - { - nearest_neighbors_unseq_(&(*first), dest); - first += 7; dest += 7; - } - else - { - nearest_neighbors_seq(first, last, dest); - } - } -} -std::vector six::sicd::details::ComplexToAMP8IPHS8I::nearest_neighbors_unseq( - std::span inputs, const six::AmplitudeTable* pAmplitudeTable) -{ - // make a structure to quickly find the nearest neighbor - const auto& converter = make_(pAmplitudeTable); - - std::vector retval(inputs.size()); - converter.nearest_neighbors_unseq(inputs.begin(), inputs.end(), retval.begin()); - return retval; -} - -#endif // SIX_sicd_have_VCL \ No newline at end of file diff --git a/six/modules/c++/six/include/six/AmplitudeTable.h b/six/modules/c++/six/include/six/AmplitudeTable.h index 604eb98f25..5fe21a1518 100644 --- a/six/modules/c++/six/include/six/AmplitudeTable.h +++ b/six/modules/c++/six/include/six/AmplitudeTable.h @@ -35,6 +35,7 @@ #include #include +#include #include #include @@ -171,7 +172,7 @@ struct SIX_SIX_API AMP8I_PHS8I_t final uint8_t phase; }; -// Control a few details of the ComplexToAMP8IPHS8I implementation, espeically "unseq" (i.e., SIMD). +// Control a few details of the ComplexToAMP8IPHS8I implementation, especially "unseq" (i.e., SIMD). #ifndef SIX_sicd_has_VCL // Do we have the "vectorclass" library? https://github.com/vectorclass/version2 #if !CODA_OSS_cpp17 // VCL needs C++17 @@ -180,36 +181,36 @@ struct SIX_SIX_API AMP8I_PHS8I_t final // __has_include is part of C++17 #if __has_include("../../../six.sicd/include/six/sicd/vectorclass/version2/vectorclass.h") || \ __has_include("six.sicd/include/six/sicd/vectorclass/version2/vectorclass.h") - //#define SIX_sicd_has_VCL 1 - #define SIX_sicd_has_VCL 0 // TODO + #define SIX_sicd_has_VCL 1 #else #define SIX_sicd_has_VCL 0 #endif // __has_include #endif // C++17 #endif -#ifndef SIX_sicd_has_experimental_simd +#ifndef SIX_sicd_has_simd // Do we have the `std::experimental::simd? https://en.cppreference.com/w/cpp/experimental/simd - #if (__GNUC__ >= 11) && CODA_OSS_cpp20 + #if (__GNUC__ >= 999) && CODA_OSS_cpp20 // TODO: 11 instead of 999 // https://github.com/VcDevel/std-simd "... shipping with GCC since version 11." - #include - #define SIX_sicd_has_experimental_simd 1 + #define SIX_sicd_has_simd 1 #else - #define SIX_sicd_has_experimental_simd 0 + #define SIX_sicd_has_simd 0 #endif // __GNUC__ #endif -#if SIX_sicd_has_VCL && SIX_sicd_has_experimental_simd - // This is because there is a single ComplexToAMP8IPHS8I::nearest_neighbors_unseq() method. - // Other than that, it should be possible to use both VCL and std::experimental::simd - #error "Can't enable both VCL and std::experimental::simd at the same time'" +#ifndef SIX_sicd_has_ximd + // This is a "hacked up" version of std::experimental::simd using std::array. + // It's primarily for development and testing: VCL needs C++17 and + // std::experimental::simd is G++11/C++20. + #define SIX_sicd_has_ximd CODA_OSS_DEBUG #endif + #ifndef SIX_sicd_ComplexToAMP8IPHS8I_unseq - #if SIX_sicd_has_VCL || SIX_sicd_has_experimental_simd + #if SIX_sicd_has_VCL || SIX_sicd_has_simd || SIX_sicd_has_ximd #define SIX_sicd_ComplexToAMP8IPHS8I_unseq 1 #else #define SIX_sicd_ComplexToAMP8IPHS8I_unseq 0 - #endif // SIX_sicd_have_VCL || SIX_sicd_have_experimental_simd + #endif // SIX_sicd_have_VCL || SIX_sicd_has_simd #endif // SIX_sicd_ComplexToAMP8IPHS8I_unseq @@ -248,38 +249,65 @@ class ComplexToAMP8IPHS8I final AMP8I_PHS8I_t nearest_neighbor_(const six::zfloat& v) const; static std::vector nearest_neighbors_par(std::span inputs, const six::AmplitudeTable*); static std::vector nearest_neighbors_seq(std::span inputs, const six::AmplitudeTable*); + #if SIX_sicd_ComplexToAMP8IPHS8I_unseq static std::vector nearest_neighbors_unseq(std::span inputs, const six::AmplitudeTable*); static std::vector nearest_neighbors_par_unseq(std::span inputs, const six::AmplitudeTable*); + + #if SIX_sicd_has_VCL + static std::vector nearest_neighbors_unseq_vcl(std::span inputs, const six::AmplitudeTable*); + #endif + #if SIX_sicd_has_simd + static std::vector nearest_neighbors_unseq_simd(std::span inputs, const six::AmplitudeTable*); #endif + #if SIX_sicd_has_ximd + static std::vector nearest_neighbors_unseq_ximd(std::span inputs, const six::AmplitudeTable*); + #endif + #endif + static std::vector nearest_neighbors(std::span inputs, const six::AmplitudeTable*); // one of the above private: - template - void nearest_neighbors_seq(TInputIt first, TInputIt last, TOutputIt dest) const; - template - void nearest_neighbors_par(TInputIt first, TInputIt last, TOutputIt dest) const; - template - void nearest_neighbors_unseq(TInputIt first, TInputIt last, TOutputIt dest) const; - template - void nearest_neighbors_par_unseq(TInputIt first, TInputIt last, TOutputIt dest) const; - - template< typename TOutputIter> - void nearest_neighbors_unseq_(const six::zfloat* p, TOutputIter dest) const; - - //! The sorted set of possible magnitudes order from small to large. - std::array uncached_magnitudes; // Order is important! This must be ... - std::span magnitudes; // ... before this. - uint8_t find_nearest(six::zfloat phase_direction, six::zfloat v) const; - - //! The difference in phase angle between two UINT phase values. - float phase_delta; - uint8_t getPhase(six::zfloat) const; - - //! Unit vector rays that represent each direction that phase can point. - std::array phase_directions; // interleaved, std::complex - std::array phase_directions_real; - std::array phase_directions_imag; + struct Impl final + { + const ComplexToAMP8IPHS8I& converter; + Impl(const ComplexToAMP8IPHS8I& c) : converter(c) {} + ~Impl() = default; + Impl(const Impl&) = delete; + Impl& operator=(const Impl&) = delete; + Impl(Impl&&) = delete; // implicitly deleted because of =delete for copy + Impl& operator=(Impl&&) = delete; // implicitly deleted because of =delete for copy + + void nearest_neighbors_seq(std::span inputs, std::span results) const; + void nearest_neighbors_par(std::span inputs, std::span results) const; + #if SIX_sicd_ComplexToAMP8IPHS8I_unseq + template + void nearest_neighbors_unseq(std::span inputs, std::span results) const; + void nearest_neighbors_par_unseq(std::span inputs, std::span results) const; + + template + void nearest_neighbors_unseq_T(std::span, std::span) const; + + #endif + + //! The sorted set of possible magnitudes order from small to large. + std::array uncached_magnitudes; + std::span magnitudes; + uint8_t find_nearest(six::zfloat phase_direction, six::zfloat v) const; + + //! The difference in phase angle between two UINT phase values. + float phase_delta; + uint8_t getPhase(six::zfloat) const; + + //! Unit vector rays that represent each direction that phase can point. + std::array phase_directions; // interleaved, std::complex + #ifdef SIX_sicd_has_VCL + std::array phase_directions_real; + std::array phase_directions_imag; + #endif + }; +public: + Impl impl; }; } }