Skip to content
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

Re-enable R's bytecode interpreter #458

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Re-enable R's bytecode interpreter #458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 0 additions & 3 deletions R/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ $(BUILD)/state/R-$(R_VERSION)/r-stage1-configured: $(BUILD)/state/R-$(R_VERSION)
--enable-R-profiling=no \
--with-pcre2 \
--disable-nls \
--enable-byte-compiled-packages=no \
--enable-long-double=no \
--enable-R-shlib
touch $@
Expand Down Expand Up @@ -182,7 +181,6 @@ $(BUILD)/state/R-$(R_VERSION)/r-stage2-configured: $(BUILD)/state/R-$(R_VERSION)
--enable-R-profiling=no \
--with-pcre2 \
--disable-nls \
--enable-byte-compiled-packages=no \
--enable-static=yes \
--host=wasm32-unknown-emscripten \
--with-internal-tzcode
Expand Down Expand Up @@ -248,7 +246,6 @@ $(BUILD)/state/R-$(R_VERSION)/r-stage2: $(BUILD)/state/R-$(R_VERSION)/r-stage1 $
.PHONY: Rprofile
Rprofile: $(BUILD)/state/R-$(R_VERSION)/r-stage2
mkdir -p "$(R_WASM)/lib/R/etc/"
echo "options(expressions=400)" > "$(R_WASM)/lib/R/etc/Rprofile.site"
echo "options(bitmapType='cairo')" >> "$(R_WASM)/lib/R/etc/Rprofile.site"

.PHONY: install
Expand Down
53 changes: 0 additions & 53 deletions patches/R-4.4.1/emscripten-disable-bcEval.diff
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion patches/R-4.4.1/series
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ emscripten-input.diff
emscripten-disable-system.diff
emscripten-jumpctxt.diff
emscripten-xhr-download.diff
emscripten-disable-bcEval.diff
emscripten-fix-blas-dlsym-search.diff
emscripten-avoid-testing-issues.diff
emscripten-r-home-stderr.diff
Expand Down
1 change: 0 additions & 1 deletion src/repl/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ const webR = new WebR({
REnv: {
R_HOME: '/usr/lib/R',
FONTCONFIG_PATH: '/etc/fonts',
R_ENABLE_JIT: '0',
COLORTERM: 'truecolor',
},
});
Expand Down
4 changes: 2 additions & 2 deletions src/tests/webR/webr-main.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1046,9 +1046,9 @@ test('Default and user provided REnv properties are merged', async () => {
await tempR.init();

// Confirm default REnv settings
const jit = await tempR.evalRString('Sys.getenv("R_ENABLE_JIT")');
const webr = await tempR.evalRString('Sys.getenv("WEBR")');
const home = await tempR.evalRString('Sys.getenv("R_HOME")');
expect(jit).toEqual('0');
expect(webr).toEqual('1');
expect(home).toEqual('/usr/lib/R');

// Confirm a user REnv setting
Expand Down
3 changes: 1 addition & 2 deletions src/webR/webr-main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ export interface WebROptions {

/**
* Environment variables to be made available for the R process.
* Default: `{ R_HOME: '/usr/lib/R', R_ENABLE_JIT: 0 }`.
* Default: `{ R_HOME: '/usr/lib/R' }`.
*/
REnv?: { [key: string]: string };

Expand Down Expand Up @@ -174,7 +174,6 @@ export interface WebROptions {
const defaultEnv = {
FONTCONFIG_PATH: '/etc/fonts',
R_HOME: '/usr/lib/R',
R_ENABLE_JIT: '0',
WEBR: '1',
WEBR_VERSION: WEBR_VERSION,
};
Expand Down