Skip to content

Bug fixing from llava and chathandler about UnsupportedOperation: fileno #961

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

Merged
merged 9 commits into from
Dec 12, 2023
Merged

Bug fixing from llava and chathandler about UnsupportedOperation: fileno #961

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
125ebe8
bug fixing
zocainViken Nov 17, 2023
b38278a
llava from readme got this error: UnsupportedOperation: fileno quic…
zocainViken Nov 30, 2023
d652647
Merge branch 'main' into bug_fixing
zocainViken Nov 30, 2023
6181e8b
Merge branch 'main' into high_api_examples
zocainViken Dec 1, 2023
86f1ee1
multi modal params fix: add logits = True -> to make llava work
zocainViken Dec 2, 2023
9009de8
Merge branch 'bug_fixing' of https://github.com/zocainViken/llama-cpp…
zocainViken Dec 2, 2023
d098af0
Merge branch 'high_api_examples' of https://github.com/zocainViken/ll…
zocainViken Dec 2, 2023
0771553
multi modal params fix: add logits = True -> to make llava work
zocainViken Dec 2, 2023
36978c3
Merge branch 'main' into bug_fixing
abetlen Dec 12, 2023
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
26 changes: 16 additions & 10 deletions llama_cpp/_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,18 @@ def __enter__(self):
if self.disable:
return self

# Check if sys.stdout and sys.stderr have fileno method
if not hasattr(self.sys.stdout, 'fileno') or not hasattr(self.sys.stderr, 'fileno'):
return self # Return the instance without making changes

self.outnull_file = self.open(self.os.devnull, "w")
self.errnull_file = self.open(self.os.devnull, "w")

self.old_stdout_fileno_undup = self.sys.stdout.fileno()
self.old_stderr_fileno_undup = self.sys.stderr.fileno()

self.old_stdout_fileno = self.os.dup(self.sys.stdout.fileno())
self.old_stderr_fileno = self.os.dup(self.sys.stderr.fileno())
self.old_stdout_fileno = self.os.dup(self.old_stdout_fileno_undup)
self.old_stderr_fileno = self.os.dup(self.old_stderr_fileno_undup)

self.old_stdout = self.sys.stdout
self.old_stderr = self.sys.stderr
Expand All @@ -40,14 +44,16 @@ def __exit__(self, *_):
if self.disable:
return

self.sys.stdout = self.old_stdout
self.sys.stderr = self.old_stderr
# Check if sys.stdout and sys.stderr have fileno method
if hasattr(self.sys.stdout, 'fileno') and hasattr(self.sys.stderr, 'fileno'):
self.sys.stdout = self.old_stdout
self.sys.stderr = self.old_stderr

self.os.dup2(self.old_stdout_fileno, self.old_stdout_fileno_undup)
self.os.dup2(self.old_stderr_fileno, self.old_stderr_fileno_undup)
self.os.dup2(self.old_stdout_fileno, self.old_stdout_fileno_undup)
self.os.dup2(self.old_stderr_fileno, self.old_stderr_fileno_undup)

self.os.close(self.old_stdout_fileno)
self.os.close(self.old_stderr_fileno)
self.os.close(self.old_stdout_fileno)
self.os.close(self.old_stderr_fileno)

self.outnull_file.close()
self.errnull_file.close()
self.outnull_file.close()
self.errnull_file.close()