Skip to content

Fix 1208 #1218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
HannoSpreeuw wants to merge 17 commits into
base: main
Choose a base branch
from
Open

Fix 1208 #1218

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
ac34770
Make "nj_max" readable outside Sapporo Light
HannoSpreeuw Feb 26, 2026
9c465b5
This code should not be needed.
HannoSpreeuw Mar 4, 2026
d868f8a
Added space
HannoSpreeuw Mar 4, 2026
07a1820
Make "interface.cc" exactly the same as in "main"
HannoSpreeuw Mar 4, 2026
7c9bb63
Move "get_nj_max" to "sapporoG6lib.cpp"
HannoSpreeuw Mar 6, 2026
fdf0468
This compiles, but does not run
HannoSpreeuw Mar 6, 2026
a10558b
This function definition need not be separate
HannoSpreeuw Mar 11, 2026
f8feb39
'extern "C"' not needed here
HannoSpreeuw Mar 11, 2026
3321825
"interface.cc" should have been added
HannoSpreeuw Mar 11, 2026
c65f686
Prototype and implementation of jdata::get_nj_max.
HannoSpreeuw Mar 11, 2026
e71a85a
Things will go wrong when there's a header include loop
HannoSpreeuw Mar 12, 2026
dd08d1f
Accommodate CPU users
HannoSpreeuw Mar 12, 2026
19998e9
With "redirection=none" this "fprintf" should work
HannoSpreeuw Mar 26, 2026
b5518cf
Print ERROR when "nj" strictly larger than "nj_max"
HannoSpreeuw Mar 26, 2026
672098e
"#ifdef __cplusplus" is redundant
HannoSpreeuw Apr 20, 2026
56756ae
Merge branch 'main' into Fix_1208
HannoSpreeuw Apr 20, 2026
f7fb543
Bypass MacOS runners for "test7"
HannoSpreeuw Apr 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions lib/sapporo_light/sapporo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,3 +270,8 @@ int sapporo::get_ngb_list(int cluster_id,
sort(nbl, nbl + min(nblen, maxlength));
return overflow;
}

int sapporo::get_nj_max() const
{
return nj_max;
}
14 changes: 13 additions & 1 deletion lib/sapporo_light/sapporo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ class sapporo {

predict = false;
nj_modified = 0;

device.address_j = NULL;

device.t_j = NULL;
Expand All @@ -182,8 +182,10 @@ class sapporo {
device.acc_i = NULL;
device.vel_i = NULL;
device.jrk_i = NULL;


};
int get_nj_max() const;
Copy link
Copy Markdown
Member

@LourensVeen LourensVeen Mar 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This works fine, but maybe it belongs with get_n_pipes on line 191?

Copy link
Copy Markdown
Collaborator Author

@HannoSpreeuw HannoSpreeuw Mar 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, you mean that would be a better place in terms of the program's logic?

~sapporo() {};

int open(int cluster_id);
Expand Down Expand Up @@ -230,3 +232,13 @@ class sapporo {
};

#endif

Copy link
Copy Markdown
Member

@LourensVeen LourensVeen Mar 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be above the #endif on 232, or things will go wrong when there's a header include loop. Maybe just add it on line 104 inside the existing extern "C" block there?

Copy link
Copy Markdown
Collaborator Author

@HannoSpreeuw HannoSpreeuw Mar 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right, will do.

#ifdef __cplusplus
extern "C" {
#endif

int g6_get_nj_max_();

#ifdef __cplusplus
}
#endif
4 changes: 3 additions & 1 deletion lib/sapporo_light/sapporoG6lib.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ extern "C" {
return grav.calc_lasthalf2(*cluster_id, *nj, *ni,
index, xi, vi, *eps2, h2, acc, jerk, pot, inn);
}
int g6_get_nj_max_() {
return grav.get_nj_max();
}

int g6_initialize_jp_buffer_(int* cluster_id, int* buf_size) {return 0;}
int g6_flush_jp_buffer_(int* cluster_id) {return 0;}
Expand Down Expand Up @@ -80,4 +83,3 @@ extern "C" {


}

6 changes: 6 additions & 0 deletions src/amuse_ph4/interface.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -936,3 +936,9 @@ int get_id_of_updated_particle(int index, int * index_of_particle, int * status)
*status = jd->UpdatedParticles[index].status;
return 0;
}

int get_nj_max(int * value)
{
*value = jd->get_nj_max();
return 0;
}
7 changes: 7 additions & 0 deletions src/amuse_ph4/interface.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,6 +464,13 @@ def recompute_timesteps():
function.result_type = 'int32'
return function

Comment thread
LourensVeen marked this conversation as resolved.
@legacy_function
def get_nj_max():
function = LegacyFunctionSpecification()
function.addParameter('nj_max', dtype='int32',
direction=function.OUT)
function.result_type = 'int32'
return function

class ph4(GravitationalDynamics,GravityFieldCode):

Expand Down
10 changes: 10 additions & 0 deletions src/amuse_ph4/src/jdata.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@

#ifdef GPU
#include "grape.h"
#include "sapporo.h"
#endif

// AMUSE STOPPING CONDITIONS SUPPORT
Expand Down Expand Up @@ -1153,3 +1154,12 @@ real jdata::get_tnext()
int ndum;
return sched->get_list(NULL, ndum);
}

int jdata::get_nj_max()
{
#ifdef GPU
return g6_get_nj_max_();
#else
return 0;
Copy link
Copy Markdown
Member

@LourensVeen LourensVeen Mar 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So on the CPU we support no particles at all? I think it makes sense to put a large number here, like INT_MAX from limits.h or, since it's C++, std::numeric_limits<int>::max() from limits. That way a script that checks won't always crash in CPU mode, only when it runs out of memory.

Copy link
Copy Markdown
Collaborator Author

@HannoSpreeuw HannoSpreeuw Mar 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah yeah, that makes sense. I will add that.

#endif
}
1 change: 1 addition & 0 deletions src/amuse_ph4/src/jdata.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@ class jdata {
void spec_output(const char *s = NULL);
void to_com();
real get_tnext();
int get_nj_max();

// In gpu.cc:

Expand Down
Loading