diff --git a/ChangeLog.txt b/ChangeLog.txt index c9ffe78d..90901fc3 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -2,6 +2,9 @@ Major updates are marked with a "*" +== MCX v2025.6.pre (Kilo-Kelvin - 2.8), FangQ == + + == MCX v2025 (Jumbo Jolt - 2.6), FangQ == 2025-01-22 [24b445e] [bug] fix incorrect per-voxel pathlength when mua->0, #164 diff --git a/README.md b/README.md index 75921c1c..883a5a6a 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Monte Carlo eXtreme (MCX) - CUDA Edition - Author: Qianqian Fang (q.fang at neu.edu) - License: GNU General Public License version 3 (GPLv3) -- Version: 2.6 (v2025, Jumbo Jolt) +- Version: 2.8 (v2025.6.pre, Kilo-Kelvin) - Website: - Download: diff --git a/README.txt b/README.txt index 48cdc7ec..c9b32ac4 100644 --- a/README.txt +++ b/README.txt @@ -5,7 +5,7 @@ *Author: Qianqian Fang *License: GNU General Public License version 3 (GPLv3) -*Version: 2.6 (v2025, Jumbo Jolt) +*Version: 2.8 (v2025.6.pre, Kilo-Kelvin) *Website: https://mcx.space *Download: https://mcx.space/wiki/?Get --------------------------------------------------------------------- diff --git a/filter b/filter index 7fc744ae..c8668b2c 160000 --- a/filter +++ b/filter @@ -1 +1 @@ -Subproject commit 7fc744ae41b41860e51b64715176220f8dc4d6e5 +Subproject commit c8668b2cc5c321e5d31b60605f81deae03926cd8 diff --git a/inno/MCXStudio.iss b/inno/MCXStudio.iss index 28c8236c..8135b47c 100755 --- a/inno/MCXStudio.iss +++ b/inno/MCXStudio.iss @@ -10,7 +10,7 @@ #define MyAppName "MCX Studio" #define MyAppDir "MCXStudio" -#define MyAppVersion "v2025" +#define MyAppVersion "v2025.6.pre" #define MyAppPublisher "COTILab" #define MyAppURL "https://mcx.space" #define MyAppExeName "mcxstudio.exe" diff --git a/manpage/mcx.1 b/manpage/mcx.1 index 9074b34d..02c1adb7 100644 --- a/manpage/mcx.1 +++ b/manpage/mcx.1 @@ -1,6 +1,6 @@ .\" Manpage for mcx. .\" Contact fangqq@gmail.com to correct errors or typos. -.TH man 7 "26 January 2025" "v2025" "Monte Carlo eXtreme (MCX) man page" +.TH man 7 "26 January 2025" "v2025.6.pre" "Monte Carlo eXtreme (MCX) man page" .SH NAME mcx \- a GPU-accelerated 3-D photon transport simulator .SH SYNOPSIS @@ -45,7 +45,7 @@ if -f is followed by nothing or a single '-', it reads input from stdin via pipe .TP \fB-Q/--bench \fR .TP -Use -Q or --bench to list all built-in benchmarks. As of MCX v2025, these benchmarks include +Use -Q or --bench to list all built-in benchmarks. As of MCX v2025.6.pre, these benchmarks include cube60 cube60b cube60planar diff --git a/manpage/mcxcontest.1 b/manpage/mcxcontest.1 index 77ca3e26..f5c350f5 100644 --- a/manpage/mcxcontest.1 +++ b/manpage/mcxcontest.1 @@ -1,6 +1,6 @@ .\" Manpage for mcxcontest. .\" Contact fangqq@gmail.com to correct errors or typos. -.TH man 7 "26 January 2025" "v2025" "mcxcontest man page" +.TH man 7 "26 January 2025" "v2025.6.pre" "mcxcontest man page" .SH NAME mcxcontest \- benchmark your NVIDIA GPU hardware using MCX built-in tests .SH SYNOPSIS diff --git a/manpage/mcxshow.1 b/manpage/mcxshow.1 index b1c2b6b4..a23e170c 100644 --- a/manpage/mcxshow.1 +++ b/manpage/mcxshow.1 @@ -1,6 +1,6 @@ .\" Manpage for mcxshow. .\" Contact fangqq@gmail.com to correct errors or typos. -.TH man 7 "26 January 2025" "v2025" "mcxshow man page" +.TH man 7 "26 January 2025" "v2025.6.pre" "mcxshow man page" .SH NAME mcxshow \- a 3D previewer for MCX/MCXCL/MMC photon transport simulations .SH SYNOPSIS diff --git a/manpage/mcxstudio.1 b/manpage/mcxstudio.1 index a6c6885f..4a61c226 100644 --- a/manpage/mcxstudio.1 +++ b/manpage/mcxstudio.1 @@ -1,6 +1,6 @@ .\" Manpage for mcxstudio. .\" Contact fangqq@gmail.com to correct errors or typos. -.TH man 7 "26 January 2025" "v2025" "Monte Carlo eXtreme (MCX) Studio man page" +.TH man 7 "26 January 2025" "v2025.6.pre" "Monte Carlo eXtreme (MCX) Studio man page" .SH NAME MCXStudio \- a cross-platform GUI for managing MCX/MCXCL/MMC simulations .SH SYNOPSIS diff --git a/manpage/mcxviewer.1 b/manpage/mcxviewer.1 index 0b239703..22b65efe 100644 --- a/manpage/mcxviewer.1 +++ b/manpage/mcxviewer.1 @@ -1,6 +1,6 @@ .\" Manpage for mcxviewer. .\" Contact fangqq@gmail.com to correct errors or typos. -.TH man 7 "26 January 2025" "v2025" "mcxviewer man page" +.TH man 7 "26 January 2025" "v2025.6.pre" "mcxviewer man page" .SH NAME mcxviewer \- a 3D NIfTI/MC2 volumetric data renderer for MCX/MCXCL/MMC photon transport simulations .SH SYNOPSIS diff --git a/manpage/photon.1 b/manpage/photon.1 index 26be518f..ea56b36a 100644 --- a/manpage/photon.1 +++ b/manpage/photon.1 @@ -1,6 +1,6 @@ .\" Manpage for photon. .\" Contact fangqq@gmail.com to correct errors or typos. -.TH man 7 "26 January 2025" "v2025" "photon man page" +.TH man 7 "26 January 2025" "v2025.6.pre" "photon man page" .SH NAME photon \- a unified command line interface for running MCX/MMC photon simulations .SH SYNOPSIS diff --git a/mcxlab/DESCRIPTION b/mcxlab/DESCRIPTION index fb7ab089..f031329d 100644 --- a/mcxlab/DESCRIPTION +++ b/mcxlab/DESCRIPTION @@ -1,5 +1,5 @@ Name: mcxlab -Version: 2.6 +Version: 2.8 Date: 2025-02-12 Title: GPU Monte Carlo eXtreme photon transport simulator for MATLAB/Octave Author: Qianqian Fang diff --git a/mcxlab/NEWS b/mcxlab/NEWS index c9ffe78d..90901fc3 100644 --- a/mcxlab/NEWS +++ b/mcxlab/NEWS @@ -2,6 +2,9 @@ Major updates are marked with a "*" +== MCX v2025.6.pre (Kilo-Kelvin - 2.8), FangQ == + + == MCX v2025 (Jumbo Jolt - 2.6), FangQ == 2025-01-22 [24b445e] [bug] fix incorrect per-voxel pathlength when mua->0, #164 diff --git a/mcxlab/README.txt b/mcxlab/README.txt index ea4ae504..00f075cb 100644 --- a/mcxlab/README.txt +++ b/mcxlab/README.txt @@ -2,7 +2,7 @@ Author: Qianqian Fang License: GNU General Public License version 3 (GPLv3) -Version: this package is part of Monte Carlo eXtreme (MCX) v2025 +Version: this package is part of Monte Carlo eXtreme (MCX) v2025.6.pre diff --git a/mcxstudio/README.txt b/mcxstudio/README.txt index 4b269500..5a7ec810 100644 --- a/mcxstudio/README.txt +++ b/mcxstudio/README.txt @@ -4,7 +4,7 @@ Author: Qianqian Fang License: GNU General Public License version 3 (GPLv3) -Version: 1.6 (v2025) +Version: 1.8 (v2025.6.pre) Website: https://mcx.space --------------------------------------------------------------------- diff --git a/mcxstudio/mcxabout.lfm b/mcxstudio/mcxabout.lfm index 7a7826bc..391187e7 100644 --- a/mcxstudio/mcxabout.lfm +++ b/mcxstudio/mcxabout.lfm @@ -45,7 +45,7 @@ object fmAbout: TfmAbout BorderStyle = bsNone Font.Color = clWhite Lines.Strings = ( - 'MCXStudio version: v2025' + 'MCXStudio version: v2025.6.pre' '' 'Funding Support:' ' This project is funded by the NIH/NIGMS under ' diff --git a/script/photon b/script/photon index 786ee056..b256ff2a 100755 --- a/script/photon +++ b/script/photon @@ -5,7 +5,7 @@ # # Author: Qianqian Fang # License: GPLv3 -# Version: 0.5 (v2020) +# Version: 0.5 (v2025.6) # Github: https://github.com/fangq/mcx/ # ############################################################################### diff --git a/src/Makefile b/src/Makefile index 5a0cfdfb..3ce6f0ff 100644 --- a/src/Makefile +++ b/src/Makefile @@ -201,7 +201,7 @@ log posix xoro fermi: LINKOPT+=$(CUOMPLINK) "$(OMP)" debugxor debuglog: CUCCOPT+=-DMCX_DEBUG fermi fermimex fermioct: CUCCOPT+=-DSAVE_DETECTORS -use_fast_math $(CUGENCODE) -fermi fermimex fermioct: CUCCOPT+=-DMCX_TARGET_NAME='"Jumbo Jolt"' +fermi fermimex fermioct: CUCCOPT+=-DMCX_TARGET_NAME='"Kilo-Kelvin"' xorfermi: xor xorofermi: xoro posixfermi: posix diff --git a/src/mcx_const.h b/src/mcx_const.h index d353babf..d20c6ea5 100644 --- a/src/mcx_const.h +++ b/src/mcx_const.h @@ -35,9 +35,9 @@ #ifndef _MCEXTREME_CONSTANT_H #define _MCEXTREME_CONSTANT_H -#define MCX_VERSION "v2025" +#define MCX_VERSION "v2025.6" #define MCX_VERSION_MAJOR 2 -#define MCX_VERSION_MINOR 6 +#define MCX_VERSION_MINOR 8 #define ONE_PI 3.1415926535897932f /**< pi */ #define TWO_PI 6.28318530717959f /**< 2*pi */ diff --git a/src/mcx_utils.c b/src/mcx_utils.c index 68418729..df778430 100644 --- a/src/mcx_utils.c +++ b/src/mcx_utils.c @@ -5340,7 +5340,7 @@ void mcx_version(Config* cfg) { const char ver[] = "$Rev:: $ " MCX_VERSION; uint v = 0; sscanf(ver, "$Rev::%x", &v); - MCX_FPRINTF(cfg->flog, "MCX Revision %x\n", v); + MCX_FPRINTF(cfg->flog, "MCX Revision:\t%x\nVersion:\t%s\nMajor:\t\t%d\nMinor:\t\t%d\n", v, MCX_VERSION, MCX_VERSION_MAJOR, MCX_VERSION_MINOR); exit(0); } @@ -5498,7 +5498,7 @@ void mcx_printheader(Config* cfg) { #Please visit our free scientific data sharing portal at " S_BLUE "https://neurojson.io " S_MAGENTA "#\n\ # and consider sharing your public datasets in standardized JSON/JData format #\n\ ###############################################################################\n\ -$Rev:: $ " S_GREEN MCX_VERSION S_MAGENTA " $Date:: $ by $Author:: $\n\ +$Rev:: $" S_GREEN MCX_VERSION S_MAGENTA " $Date:: $ by $Author:: $\n\ ###############################################################################\n" S_RESET); } } diff --git a/utils/NEWS b/utils/NEWS index c9ffe78d..90901fc3 100644 --- a/utils/NEWS +++ b/utils/NEWS @@ -2,6 +2,9 @@ Major updates are marked with a "*" +== MCX v2025.6.pre (Kilo-Kelvin - 2.8), FangQ == + + == MCX v2025 (Jumbo Jolt - 2.6), FangQ == 2025-01-22 [24b445e] [bug] fix incorrect per-voxel pathlength when mua->0, #164 diff --git a/winget/coti.mcxstudio.installer.yaml b/winget/coti.mcxstudio.installer.yaml index b1c7b9b3..f23b1fe4 100644 --- a/winget/coti.mcxstudio.installer.yaml +++ b/winget/coti.mcxstudio.installer.yaml @@ -2,13 +2,13 @@ # yaml-language-server: $schema=https://aka.ms/winget-manifest.installer.1.1.0.schema.json PackageIdentifier: coti.mcxstudio -PackageVersion: v2025 +PackageVersion: v2025.6 MinimumOSVersion: 10.0.0.0 InstallerType: inno Scope: machine Installers: - Architecture: x64 - InstallerUrl: https://mcx.space/nightly/release/v2025/MCXStudio-v2025-installer.exe + InstallerUrl: https://mcx.space/nightly/release/v2025.6/MCXStudio-v2025.6-installer.exe InstallerSha256: 2e48cf40473c5601fff8f6fdc22734f83d5e4b935298a6c184468bb96b23fc2b ManifestType: installer ManifestVersion: 1.9.0 diff --git a/winget/coti.mcxstudio.locale.en-US.yaml b/winget/coti.mcxstudio.locale.en-US.yaml index dc988bb8..a752e13c 100644 --- a/winget/coti.mcxstudio.locale.en-US.yaml +++ b/winget/coti.mcxstudio.locale.en-US.yaml @@ -2,7 +2,7 @@ # yaml-language-server: $schema=https://aka.ms/winget-manifest.defaultLocale.1.1.0.schema.json PackageIdentifier: coti.mcxstudio -PackageVersion: v2025 +PackageVersion: v2025.6 PackageLocale: en-US Publisher: COTILab PublisherUrl: https://mcx.space @@ -12,9 +12,9 @@ Author: Qianqian Fang PackageName: MCX Studio PackageUrl: https://sourceforge.net/projects/mcx/ License: GNU General Public License v3.0 (GPL-3.0) -LicenseUrl: https://github.com/fangq/mcx/blob/v2025/LICENSE.txt +LicenseUrl: https://github.com/fangq/mcx/blob/v2025.6/LICENSE.txt Copyright: Copyright (c) 2010-2025 Qianqian Fang -CopyrightUrl: https://github.com/fangq/mcx/blob/v2025/LICENSE.txt +CopyrightUrl: https://github.com/fangq/mcx/blob/v2025.6/LICENSE.txt ShortDescription: Monte Carlo eXtreme (MCX) - Physically accurate and validated GPU ray-tracer Description: Monte Carlo eXtreme, or MCX, is a Monte Carlo photon simulator for modeling light transport in 3D turbid media. It uses NVIDIA graphics processing units (GPUs) to simulate thousands of photons simultaneously, making it one of the fastest and most accurate photon modeling tools. Moniker: mcxstudio @@ -36,6 +36,6 @@ ReleaseNotes: |- - [Critical Bug fix] Fix incorrect partial path lengths for long-path photons, (fangq/mcx\#222) - [Bug fix] Further updates to the handling of low absorption medium (fangq/mcx\#164) - [Bug fix] A bug fix related to multi-source simulation to properly return the source ID (fangq/mcx\#217) -ReleaseNotesUrl: https://mcx.space/wiki/index.cgi?Doc/ReleaseNotes/v2025 +ReleaseNotesUrl: https://mcx.space/wiki/index.cgi?Doc/ReleaseNotes/v2025.6 ManifestType: defaultLocale ManifestVersion: 1.9.0 diff --git a/winget/coti.mcxstudio.yaml b/winget/coti.mcxstudio.yaml index ed0263bc..86a537f8 100644 --- a/winget/coti.mcxstudio.yaml +++ b/winget/coti.mcxstudio.yaml @@ -2,7 +2,7 @@ # yaml-language-server: $schema=https://aka.ms/winget-manifest.version.1.1.0.schema.json PackageIdentifier: coti.mcxstudio -PackageVersion: v2025 +PackageVersion: v2025.6 DefaultLocale: en-US ManifestType: version ManifestVersion: 1.9.0