Skip to content

Commit

Permalink
Updates from review
Browse files Browse the repository at this point in the history
  • Loading branch information
devinrsmith committed Jan 24, 2023
1 parent 0b53bf4 commit 36af912
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 22 deletions.
2 changes: 1 addition & 1 deletion py/embedded-server/deephaven_server/start_jvm.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ def start_jvm(
# Append args that, if missing, could cause the jvm to be misconfigured for deephaven and its dependencies
# TODO make these less required (i.e. at your own risk, remove them)
required_jvm_args = [
# Allow netty to (reflectively) access java.nio.Buffer fields
# Allow access to java.nio.Buffer fields
'--add-opens=java.base/java.nio=ALL-UNNAMED',
# Allow our hotspot-impl project to access internals
'--add-exports=java.management/sun.management=ALL-UNNAMED',
Expand Down
10 changes: 0 additions & 10 deletions py/jpy-integration/src/pythonToJava/python/test/test_jpy.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,16 +118,6 @@ def test_numpy_array(self):
np_array = None
self.assertEqual(get_refcount(jpy_array_id), jpy_array_refcount)

# The refcounting seems to work different in the memoryview case as we update from 3.7 to 3.10; either cpython or
# numpy (or both) may be interacting differently. Without digging down more into the details (if this is still an
# efficient use of the buffer protocol) there may be hooks to reference count different viewers differently.
# mv = memoryview(b'123412341234')
# mv_id = id(mv)
# mv_refcount = get_refcount(mv_id)
# np_array = numpy.frombuffer(mv, numpy.int32)
# self.assertEqual(get_refcount(mv_id), mv_refcount + 1)
# np_array = None
# self.assertEqual(get_refcount(mv_id), mv_refcount)

def test_pyobject_unwrap(self):
import jpy
Expand Down
2 changes: 1 addition & 1 deletion py/server/test_helper/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def start_jvm(jvm_props: Dict[str, str] = None):
'-XX:MinRAMPercentage=70.0',
'-XX:MaxRAMPercentage=80.0',

# Allow netty to (reflectively) access java.nio.Buffer fields
# Allow access to java.nio.Buffer fields
'--add-opens=java.base/java.nio=ALL-UNNAMED',

# Allow our hotspot-impl project to access internals
Expand Down
14 changes: 4 additions & 10 deletions sphinx/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,21 +81,15 @@
workspace = os.environ.get('DEEPHAVEN_WORKSPACE', '.')
propfile = os.environ.get('DEEPHAVEN_PROPFILE', 'dh-defaults.prop')
jvm_properties = {
'Configuration.rootFile': propfile,
'deephaven.dataDir': os.path.realpath(workspace),
}
'Configuration.rootFile': propfile,
'deephaven.dataDir': os.path.realpath(workspace),
}

jvm_options = {
'-XX:InitialRAMPercentage=25.0',
'-XX:MinRAMPercentage=70.0',
'-XX:MaxRAMPercentage=80.0',

# Allow netty to (reflectively) access java.nio.Buffer fields
# Allow access to java.nio.Buffer fields
'--add-opens=java.base/java.nio=ALL-UNNAMED',

# Allow our hotspot-impl project to access internals
'--add-exports=java.management/sun.management=ALL-UNNAMED',

# Allow our clock-impl project to access internals
'--add-exports=java.base/jdk.internal.misc=ALL-UNNAMED',
}
Expand Down

0 comments on commit 36af912

Please sign in to comment.